diff --git a/classes/phing/tasks/system/FunctionParam.php b/classes/phing/tasks/system/FunctionParam.php deleted file mode 100644 index c69bfea1e2..0000000000 --- a/classes/phing/tasks/system/FunctionParam.php +++ /dev/null @@ -1,32 +0,0 @@ - nested tag for PhpTask. - * - * @package phing.tasks.system - */ -class FunctionParam -{ - private $val; - - /** - * @param $v - */ - public function setValue($v) - { - $this->val = $v; - } - - /** - * @param $v - */ - public function addText($v) - { - $this->val = $v; - } - - public function getValue() - { - return $this->val; - } -} diff --git a/classes/phing/tasks/system/PhpEvalTask.php b/classes/phing/tasks/system/PhpEvalTask.php index 14da7b486b..e02ac5e9dc 100644 --- a/classes/phing/tasks/system/PhpEvalTask.php +++ b/classes/phing/tasks/system/PhpEvalTask.php @@ -187,11 +187,8 @@ public function setExpression($expression) } /** Add a nested tag. */ - public function createParam() + public function addParam(Parameter $param) { - $p = new FunctionParam(); - $this->params[] = $p; - - return $p; + $this->params[] = $param; } } diff --git a/classes/phing/types/Parameter.php b/classes/phing/types/Parameter.php index b356dbcb79..2ad919f097 100644 --- a/classes/phing/types/Parameter.php +++ b/classes/phing/types/Parameter.php @@ -78,6 +78,14 @@ public function setValue($value) $this->value = (string) $value; } + /** + * @param $v + */ + public function addText($v) + { + $this->val = $v; + } + public function getName() { return $this->name;