fix for function call with variables

iguana007 · Dec 16, 2010 · e849c56 · e849c56
1 parent e2ddd11
commit e849c56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Filters/NetteLatteFilter.php b/Filters/NetteLatteFilter.php
@@ -124,7 +124,6 @@ public function extract($file) {
 				);
 				foreach ($prefix as $position => $type) {
 					if (!isset($params[$position])) {
-						/** @todo print warning */
 						continue 2; // continue with next message
 					}
 					$result[$type] = $this->stripQuotes($this->fixEscaping($params[$position]));

diff --git a/Filters/PHPFilter.php b/Filters/PHPFilter.php
@@ -50,13 +50,16 @@ public function extract($file) {
 				$iterator->next();
 				while ($iterator->valid()) {
 					$token = $iterator->current();
-					/** @todo check messages for variables ( 'foo'.$bar, "foo$bar") */
 					if ($token === '(') {
 						$position = 1;
 					} elseif ($token === ',') {
 						$position++;
 					} elseif ($token === ')') {
-						/** @todo check, that all parameters are set */
+						foreach ($definition as $type) {
+							if (!isset($message[$type])) {
+								continue 2;
+							}
+						}
 						$data[] = $message;
 						$iterator->next();
 						break;