Merge pull request #25 from boenrobot/phartemplate

Added a "//" in front of the replacement holder in phartemplate.php
pyrus · Jul 30, 2014 · 21c43b8 · 21c43b8
2 parents 2b165b9 + 03e02ce
commit 21c43b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/data/phartemplate.php b/data/phartemplate.php
@@ -1,7 +1,7 @@
 <?php
 if (!class_exists('Phar')) {
     if (!class_exists('PHP_Archive')) {
-@PHPARCHIVE@
+//@PHPARCHIVE@
     }
     if (!in_array('phar', stream_get_wrappers(), true)) {
         stream_wrapper_register('phar', 'PHP_Archive');

diff --git a/src/Pyrus/Developer/Creator/Phar/PHPArchive.php b/src/Pyrus/Developer/Creator/Phar/PHPArchive.php
@@ -50,15 +50,15 @@ public function __construct(
         }
         $phparchive = '?>' . $phparchive . '<?php';
         $template = @file_get_contents(
-            dirname(__FILE__) .
-            '/../../../../../data/pear2.php.net/PEAR2_Pyrus_Developer/phartemplate.php'
+            __DIR__ .
+            '/../../../../data/pear2.php.net/PEAR2_Pyrus_Developer/phartemplate.php'
         );
         if (!$template) {
             $template = file_get_contents(
                 __DIR__ . '/../../../../data/phartemplate.php'
             );
         }
-        $this->stub = str_replace('@PHPARCHIVE@', $phparchive, $template);
+        $this->stub = str_replace('//@PHPARCHIVE@', $phparchive, $template);
         if ($startupfile === false) {
             $startupfile = '<?php
 $extract = getcwd();