New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.3.0 #47

Merged
merged 74 commits into from Sep 25, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+9 −4
Diff settings

Always

Just for now

Viewing a subset of changes. View all

Fix error

  • Loading branch information...
emulienfou committed Sep 16, 2016
commit ae84456ed010827562e2e145200fdfb9297723eb
Copy path View file
@@ -510,15 +510,17 @@ public function addPlugin($name, $callback, $compilable = false)
'type' => self::FUNC_PLUGIN | $compilable,
'callback' => $callback
);
} else {
throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
}
throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
} elseif ($callback instanceof \Closure) {
$this->plugins[$name] = array(
'type' => self::FUNC_PLUGIN | $compilable,
'callback' => $callback
);
} else {
throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
}
throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
}
/**
@@ -1506,9 +1508,9 @@ public function readVar($varstr)
array_shift($m[2]);
if (defined($m[2][0])) {
return constant($m[2][0]);
} else {
return null;
}
return null;
}
if ($cur !== $this->globals) {
array_shift($m[2]);
@@ -1574,6 +1576,9 @@ public function readVar($varstr)
*/
public function assignInScope($value, $scope)
{
$tree = &$this->scopeTree;
$data = &$this->data;
if (!is_string($scope)) {
$this->triggerError('Assignments must be done into strings, (' . gettype($scope) . ') ' . var_export($scope, true) . ' given', E_USER_ERROR);
}
ProTip! Use n and p to navigate between commits in a pull request.