Skip to content

Allow function and const import in the current namespace using use #123

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow function and const import in the current namespace using use #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e930f4b
Allow function import in the current namespace using `use`
krtek4 Oct 12, 2016
c6927e0
Allow const import in the current namespace using `use`
krtek4 Oct 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions lib/Boris/ShallowParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,18 +214,28 @@ private function _scanChar($result)

return true;
}

private function _scanUse($result)
{
if (preg_match("/^use (.+?);/", $result->buffer, $use)) {
if (preg_match("/^use (?P<type>function |const )?(?P<name>.+?)( as (?P<alias>.+?))?;/", $result->buffer, $use)) {
$result->buffer = substr($result->buffer, strlen($use[0]));
if (strpos($use[0], ' as ') !== false) {
list($class, $alias) = explode(' as ', $use[1]);
} else {
$class = $use[1];
$alias = substr($use[1], strrpos($use[1], '\\') + 1);

if (! isset($use['alias']) || strlen($use['alias']) == 0) {
$use['alias'] = substr($use['name'], strrpos($use['name'], '\\') + 1);
}

switch(trim($use['type'])) {
case 'function':
$result->statements[] = sprintf("function %s() { return call_user_func_array('%s', func_get_args()); };", $use['alias'], $use['name']);
break;
case 'const':
$result->statements[] = sprintf("define('%s', %s);", $use['alias'], $use['name']);
break;
default:
$result->statements[] = sprintf("class_alias('%s', '%s');", $use['name'], $use['alias']);
break;
}
$result->statements[] = sprintf("class_alias('%s', '%s');", $class, $alias);

return true;
} else {
return false;
Expand Down