Permalink
Browse files

Add stricter validation to TestTask.

Empty classnames, and classnames without the correct type suffix
are no longer accepted.  They did the wrong thing anyways.

Fixes #2267
  • Loading branch information...
markstory committed Nov 17, 2011
1 parent 9c5ad71 commit 8981f49bd5ab679b894c70809a47346f7b5b08d1
Showing with 8 additions and 6 deletions.
  1. +8 −6 lib/Cake/Console/Command/Task/TestTask.php
@@ -205,12 +205,14 @@ public function getClassName($objectType) {
$this->out(++$key . '. ' . $option);
$keys[] = $key;
}
$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
if (isset($options[$selection - 1])) {
$selection = $options[$selection - 1];
}
if ($type !== 'Model') {
$selection = substr($selection, 0, $typeLength * - 1);
while (empty($selection)) {
$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
if (is_numeric($selection) && isset($options[$selection - 1])) {
$selection = $options[$selection - 1];
}
if ($type !== 'Model') {
$selection = substr($selection, 0, $typeLength * - 1);
}
}
return $selection;
}

0 comments on commit 8981f49

Please sign in to comment.