- It is more unlikely to be looking for files named '0' or '1' and those

  are also quite intuitive if seeing them as return value of the search.

diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index 734f0e6d58122bdd8f0f33ef7367c226604b03c1..c6017a73c2d4979b92f2633335fd62d13bbeefb2 100755 (executable)
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -5,6 +5,6 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re
 pharcmd: $(builddir)/phar.phar
 
 $(builddir)/phar.phar: $(srcdir)/phar/*.inc $(srcdir)/phar/*.php
-       php -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p optional -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/
+       php -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/
        @chmod +x $(builddir)/phar.phar
 

diff --git a/ext/phar/phar.php b/ext/phar/phar.php
index c2dbd4309954c55e4bf9612baf9cf015a002ec7a..62db215a39fb25f59d60989a03412b1362d20e7d 100644 (file)
--- a/ext/phar/phar.php
+++ b/ext/phar/phar.php
@@ -371,7 +371,7 @@ class PharCommand extends CLICommand
 
        static function cli_arg_typ_loader($arg)
        {
-               if ($arg == 'auto' || $arg == 'optional')
+               if (($arg == '0' || $arg == '1') && !file_exists($arg))
                {
                        $found = NULL;
                        foreach(split("\n", `pear list-files PHP_Archive`) as $ent)
@@ -385,7 +385,7 @@ class PharCommand extends CLICommand
                        }
                        if (!isset($found)) {
                                echo "Pear package PHP_Archive or Archive.php class file not found.\n";
-                               if ($arg != 'optional')
+                               if ($arg != '0')
                                {
                                        exit(1);
                                }
@@ -485,7 +485,7 @@ class PharCommand extends CLICommand
                        'f' => array('typ'=>'pharnew', 'val'=>NULL,      'required'=>1, 'inf'=>'<file>   Specifies the phar file to work on.'),
                        'h' => array('typ'=>'select',  'val'=>NULL,                     'inf'=>'<method> Selects the hash algorithmn.', 'select'=>array('md5'=>'MD5','sha1'=>'SHA1','sha256'=>'SHA256','sha512'=>'SHA512')),
                        'i' => array('typ'=>'regex',   'val'=>NULL,                     'inf'=>'<regex>  Specifies a regular expression for input files.'),
-                       'p' => array('typ'=>'loader',  'val'=>NULL,                     'inf'=>'<loader> Location of PHP_Archive class file (pear list-files PHP_Archive). You can use \'auto\' or \'optional\' to locate it automatically using the mentioned pear command. When using \'optional\' the command does not error out when the class file cannot be located.'),
+                       'p' => array('typ'=>'loader',  'val'=>NULL,                     'inf'=>'<loader> Location of PHP_Archive class file (pear list-files PHP_Archive). You can use \'0\' or \'1\' to locate it automatically using the mentioned pear command. When using \'0\' the command does not error out when the class file cannot be located.'),
                        's' => array('typ'=>'file',    'val'=>NULL,                     'inf'=>'<stub>   Select the stub file (excluded from list of input files/dirs).'),
                        'x' => array('typ'=>'regex',   'val'=>NULL,                     'inf'=>'<regex>  Regular expression for input files to exclude.'),
                        ''  => array('typ'=>'any',     'val'=>NULL,      'required'=>1, 'inf'=>'         Any number of input files and directories.'),

diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
index 35dae64622fb6d6a1d5b679775c6db4b8510e4bc..e8768c9ed6ec558874dcc372a8563a942199b017 100755 (executable)
--- a/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
@@ -111,7 +111,7 @@ class PharCommand extends CLICommand
             'p' => array(
                 'typ' => 'loader',
                 'val' => NULL,
-                'inf' => '<loader> Location of PHP_Archive class file (pear list-files PHP_Archive). You can use \'auto\' or \'optional\' to locate it automatically using the mentioned pear command. When using \'optional\' the command does not error out when the class file cannot be located.',
+                'inf' => '<loader> Location of PHP_Archive class file (pear list-files PHP_Archive). You can use \'0\' or \'1\' to locate it automatically using the mentioned pear command. When using \'0\' the command does not error out when the class file cannot be located.',
             ),
             's' => array(
                 'typ' => 'file',
@@ -188,7 +188,7 @@ class PharCommand extends CLICommand
      */
     static function cli_arg_typ_loader($arg, $cfg, $key)
     {
-        if ($arg == 'auto' || $arg == 'optional') {
+        if (($arg == '0' || $arg == '1') && !file_exists($arg)) {
             $found = NULL;
             foreach(split("\n", `pear list-files PHP_Archive`) as $ent) {
                 $matches = NULL;
@@ -199,7 +199,7 @@ class PharCommand extends CLICommand
             }
             if (!isset($found)) {
                $msg = "Pear package PHP_Archive or Archive.php class file not found.\n";
-               if ($arg == 'optional') {
+               if ($arg == '0') {
                        self::notice($msg);
                } else {
                        self::error($msg);