svn: /phd/trunk/ package.xml phpdotnet/phd/BuildOptionsParser.php
| From: | Hannes Magnusson | Date: | Sat, 26 Dec 2009 11:01:56 +0000 |
| Subject: | svn: /phd/trunk/ package.xml phpdotnet/phd/BuildOptionsParser.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-5720@lists.php.net to get a copy of this message | ||
bjori Sat, 26 Dec 2009 11:01:56 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292638
Log:
Fixed bug#45098 (named constants require long opt)
Bug: http://bugs.php.net/45098 (Open) named constants
require long opt
Changed paths:
U phd/trunk/package.xml
U phd/trunk/phpdotnet/phd/BuildOptionsParser.php
Modified: phd/trunk/package.xml
===================================================================
--- phd/trunk/package.xml 2009-12-26 06:05:54 UTC (rev 292637)
+++ phd/trunk/package.xml 2009-12-26 11:01:56 UTC (rev 292638)
@@ -59,7 +59,7 @@
</stability>
<license uri="http://www.opensource.org/licenses/bsd-license.php">BSD
Style</license>
<notes>
- - notes
+ - Fixed bug#45098 - named constants require long opt. (Hannes)
</notes>
<contents>
Modified: phd/trunk/phpdotnet/phd/BuildOptionsParser.php
===================================================================
--- phd/trunk/phpdotnet/phd/BuildOptionsParser.php 2009-12-26 06:05:54 UTC (rev 292637)
+++ phd/trunk/phpdotnet/phd/BuildOptionsParser.php 2009-12-26 11:01:56 UTC (rev 292638)
@@ -14,7 +14,7 @@
'output:' => 'o:', // The output directory
'partial:' => 'p:', // The ID to render (optionally
ignoring its children)
'skip:' => 's:', // The ID to skip (optionally
skipping its children too)
- 'verbose:' => 'v:', // Adjust the verbosity level
+ 'verbose:' => 'v::', // Adjust the verbosity level
'list' => 'l', // List supported
packages/formats
'lang::' => 'L:', // Language hint (used by the
CHM)
'color:' => 'c:', // Use color output if possible
@@ -177,8 +177,11 @@
$verbose |= (int)constant($const);
} elseif (is_numeric($const)) {
$verbose |= (int)$const;
+ } elseif (empty($const)) {
+ $verbose = max($verbose, 1);
+ $verbose <<= 1;
} else {
- trigger_error("Unknown option passed to --$k, $const", E_USER_ERROR);
+ trigger_error("Unknown option passed to --$k, '$const'",
E_USER_ERROR);
}
}
}