- Include 'class Phar extends PHP_Archive {}' when using -p

diff --git a/ext/phar/phar.php b/ext/phar/phar.php
index c294e5c93095a1886025dcb02ff5ee451d0ca225..067ecc002d46f6dc6eece6a2672da7a9ee75d6a9 100644 (file)
--- a/ext/phar/phar.php
+++ b/ext/phar/phar.php
@@ -503,7 +503,7 @@ class PharCommand extends CLICommand
                                }                               
                                $s.= '<?php if (!class_exists("Phar",0) && !class_exists("PHP_Archive")) { ?>';
                                $s.= file_get_contents($loader);
-                               $s.= '<?php } ?>';
+                               $s.= '<?php class Phar extends PHP_Archive {} } ?>';
                                if (substr($c,0,1) == '#') {
                                        $s.= substr($c,strpos($c, "\n")+1);
                                }

diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
index a4da19ee71203ee531149bfec78e5e6a3ac7a68a..f8ab8eebf9532288634c52138e682c79332f18e6 100755 (executable)
--- a/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
@@ -260,7 +260,7 @@ class PharCommand extends CLICommand
                                }                               
                                $s.= '<?php if (!class_exists("Phar",0) && !class_exists("PHP_Archive")) { ?>';
                                $s.= file_get_contents($loader);
-                               $s.= '<?php } ?>';
+                               $s.= '<?php class Phar extends PHP_Archive {} } ?>';
                                if (substr($c,0,1) == '#') {
                                        $s.= substr($c,strpos($c, "\n")+1);
                                }