support for running .ext.phars without ext/phar

[pharext/pharext] / src / pharext / Task / PharBuild.php

diff --git a/src/pharext/Task/PharBuild.php b/src/pharext/Task/PharBuild.php
index bc79f79e61e018e1b194f2d0bf7d81652b6e37a7..25dd7a42a911ba4f6e7195e5654e8985030f2b1e 100644 (file)
--- a/src/pharext/Task/PharBuild.php
+++ b/src/pharext/Task/PharBuild.php
@@ -19,6 +19,11 @@ class PharBuild implements Task
         */
        private $source;
 
+       /**
+        * @var string
+        */
+       private $stub;
+
        /**
         * @var array
         */
@@ -31,11 +36,13 @@ class PharBuild implements Task
 
        /**
         * @param SourceDir $source extension source directory
+        * @param string $stub path to phar stub
         * @param array $meta phar meta data
         * @param bool $readonly whether the stub has -dphar.readonly=1 set
         */
-       public function __construct(SourceDir $source = null, array $meta = null, $readonly = true) {
+       public function __construct(SourceDir $source = null, $stub, array $meta = null, $readonly = true) {
                $this->source = $source;
+               $this->stub = $stub;
                $this->meta = $meta;
                $this->readonly = $readonly;
        }
@@ -57,12 +64,12 @@ class PharBuild implements Task
 
                if ($this->meta) {
                        $phar->setMetadata($this->meta);
-                       if (isset($this->meta["stub"])) {
-                               $phar->setDefaultStub($this->meta["stub"]);
-                               $phar->setStub("#!/usr/bin/php -dphar.readonly=" .
-                                       intval($this->readonly) ."\n".
-                                       $phar->getStub());
-                       }
+               }
+               if (is_file($this->stub)) {
+                       $stub = preg_replace_callback('/^#include <([^>]+)>/m', function($includes) {
+                               return file_get_contents($includes[1], true, null, 5);
+                       }, file_get_contents($this->stub));
+                       $phar->setStub($stub);
                }
 
                $phar->buildFromIterator((new Task\BundleGenerator)->run());
@@ -74,10 +81,11 @@ class PharBuild implements Task
                                foreach ($this->source as $index => $file) {
                                        if (is_resource($file)) {
                                                printf("Packaging %s ...\n", $index);
+                                               $phar[$index] = $file;
                                        } else {
                                                printf("Packaging %s ...\n", $index = trim(substr($file, $blen), "/"));
+                                               $phar->addFile($file, $index);
                                        }
-                                       $phar[$index] = $file;
                                }
                        } else {
                                $phar->buildFromIterator($this->source, $this->source->getBaseDir());