Permalink
Browse files

Bump bundled version of ConsoleTools.

  • Loading branch information...
1 parent 7a1366e commit 813084408f36e92536652adbb2257ffa823608c7 @sebastianbergmann committed Aug 8, 2006
Showing with 72 additions and 67 deletions.
  1. +1 −1 PHPUnit/Bundled/eZcomponents/ConsoleTools/console_autoload.php
  2. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/exception.php
  3. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/invalid_option_name.php
  4. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/no_position_stored.php
  5. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option.php
  6. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_already_registered.php
  7. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_arguments_violation.php
  8. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_dependency_violation.php
  9. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_exclusion_violation.php
  10. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_mandatory_violation.php
  11. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_missing_value.php
  12. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_no_alias.php
  13. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_not_exists.php
  14. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_string_not_wellformed.php
  15. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_too_many_values.php
  16. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/exceptions/option_type_violation.php
  17. +9 −4 PHPUnit/Bundled/eZcomponents/ConsoleTools/input.php
  18. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/input/option.php
  19. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/options/output.php
  20. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/options/progressbar.php
  21. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/options/progressmonitor.php
  22. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/options/statusbar.php
  23. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/options/table.php
  24. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/output.php
  25. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/progressbar.php
  26. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/progressmonitor.php
  27. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/statusbar.php
  28. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/structs/option_rule.php
  29. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/structs/output_format.php
  30. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/structs/output_formats.php
  31. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/table.php
  32. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/table/cell.php
  33. +2 −2 PHPUnit/Bundled/eZcomponents/ConsoleTools/table/row.php
@@ -3,7 +3,7 @@
* Autoload map for ConsoleTools package.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
* @filesource
@@ -3,7 +3,7 @@
* Base exception for the ConsoleTools package.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -12,7 +12,7 @@
* General exception container for the ConsoleTools component.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
abstract class ezcConsoleException extends ezcBaseException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleInvalidOptionNameException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* a "-") was received by {@link ezcConsoleOption::__construct}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleInvalidOptionNameException extends ezcConsoleException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleNoPositionStoredException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -12,7 +12,7 @@
* 'Cannot restore position, if no position has been stored before.'.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleNoPositionStoredException extends ezcConsoleException
{
@@ -3,7 +3,7 @@
* Base option exception for the ConsoleTools package.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -14,7 +14,7 @@
* errors produced by invalid user submitted options {@link ezcConsoleInput::process()}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
abstract class ezcConsoleOptionException extends ezcConsoleException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionAlreadyRegisteredException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -12,7 +12,7 @@
* The option name you tried to register is already in use.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionAlreadyRegisteredException extends ezcConsoleException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionArgumentsViolationException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* This exception can be caught using {@link ezcConsoleOptionException}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionArgumentsViolationException extends ezcConsoleOptionException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionDependencyViolationException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* This exception can be caught using {@link ezcConsoleOptionException}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionDependencyViolationException extends ezcConsoleOptionException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionExclusionViolationException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* This exception can be caught using {@link ezcConsoleOptionException}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionExclusionViolationException extends ezcConsoleOptionException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionMandatoryViolationException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* This exception can be caught using {@link ezcConsoleOptionException}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionMandatoryViolationException extends ezcConsoleOptionException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionMissingValueException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* This exception can be caught using {@link ezcConsoleOptionException}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionMissingValueException extends ezcConsoleOptionException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionNoAliasException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -12,7 +12,7 @@
* The alias you tried to unregister is a real option.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionNoAliasException extends ezcConsoleException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionNotExistsException
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* This exception can be caught using {@link ezcConsoleOptionException}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionNotExistsException extends ezcConsoleOptionException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionStringNotWellformedException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -12,7 +12,7 @@
* The option definition string supplied is not wellformed.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionStringNotWellformedException extends ezcConsoleException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionTooManyValuesException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* This exception can be caught using {@link ezcConsoleOptionException}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionTooManyValuesException extends ezcConsoleOptionException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOptionTypeViolationException.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
@@ -13,7 +13,7 @@
* This exception can be caught using {@link ezcConsoleOptionException}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOptionTypeViolationException extends ezcConsoleOptionException
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleInput class.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
* @filesource
@@ -103,7 +103,7 @@
* </code>
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleInput
{
@@ -164,7 +164,7 @@ class ezcConsoleInput
/**
- * Indecates if an option was submitted, that has the isHelpOption flag set.
+ * Indicates if an option was submitted, that has the isHelpOption flag set.
*
* @var bool
*/
@@ -636,7 +636,7 @@ public function getHelp( $long = false, array $params = array() )
* for, default is all.
* @return ezcConsoleTable The filled table.
*/
- public function getHelpTable( ezcConsoleTable $table, $long = false, array $params = null )
+ public function getHelpTable( ezcConsoleTable $table, $long = false, array $params = array() )
{
$help = $this->getHelp( $long, $params );
$i = 0;
@@ -933,6 +933,11 @@ private function checkRules()
// Not set and not mandatory? No checking.
if ( $option->value === false || is_array( $option->value ) && count( $option->value ) === 0 )
{
+ // Default value to set?
+ if ( $option->default !== null )
+ {
+ $option->value = $option->default;
+ }
// Parameter was not set so ignore it's rules.
continue;
}
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOption class.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
* @filesource
@@ -18,7 +18,7 @@
* class {@link ezcConsoleInput}.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOption {
@@ -3,7 +3,7 @@
* File containing the ezcConsoleOutputOptions class.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
* @filesource
@@ -15,7 +15,7 @@
* This class stores the options for the {@link ezcConsoleOutput} class.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleOutputOptions extends ezcBaseOptions
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleProgressbarOptions class.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
* @filesource
@@ -14,7 +14,7 @@
* This class stores the options for the {@link ezcConsoleOutput} class.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleProgressbarOptions extends ezcBaseOptions
{
@@ -3,7 +3,7 @@
* File containing the ezcConsoleProgressMonitorOptions class.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
* @filesource
@@ -14,7 +14,7 @@
* This class stores the options for the {@link ezcConsoleOutput} class.
*
* @package ConsoleTools
- * @version 1.1
+ * @version 1.1.1
*/
class ezcConsoleProgressMonitorOptions extends ezcBaseOptions
{
Oops, something went wrong.

0 comments on commit 8130844

Please sign in to comment.