Whitelist global functions by default #231
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
theofidry
commented
Jun 30, 2018
.travis.yml
Outdated
| @@ -29,6 +29,7 @@ install: | |||
| - composer install --no-interaction --no-progress --no-suggest --prefer-dist $COMPOSER_FLAGS | |||
|
|
|||
| script: | |||
| - ["$(ls _specs)" ] || echo "Empty" | |||
There was a problem hiding this comment.
Tests that no files is in _specs. Indeed this directory should be used only for development but leaving files there is a mistake. It should however be extracted in a dedicated PR
scoper.inc.php
Outdated
| @@ -15,7 +15,6 @@ | |||
| use Isolated\Symfony\Component\Finder\Finder; | |||
|
|
|||
| return [ | |||
| 'prefix' => 'Foo', | |||
| 'whitelist' => [ | |||
There was a problem hiding this comment.
should be done in a different PR
| @@ -287,7 +289,23 @@ private static function retrieveWhitelist(array $config): Whitelist | |||
| } | |||
| } | |||
|
|
|||
| return Whitelist::create($whitelistGlobalConstants, ...$whitelist); | |||
| if (false === array_key_exists(self::WHITELIST_GLOBAL_FUNCTIONS_KEYWORD, $config)) { | |||
There was a problem hiding this comment.
tests are missing for this new option
| use function iterator_to_array; | ||
| use const PHP_EOL; | ||
| use PhpParser\Node\Name\FullyQualified; | ||
| use function sprintf; | ||
|
|
||
| final class ScoperAutoloadGenerator |
| use PhpParser\Node\Name\FullyQualified; | ||
| use function count; | ||
|
|
||
| final class UserGlobalFunctionCollection implements IteratorAggregate, Countable |
| use function count; | ||
|
|
||
| /** | ||
| * @TODO |
| * | ||
| * @private | ||
| */ | ||
| final class FunctionIdentifierRecorder extends NodeVisitorAbstract |
There was a problem hiding this comment.
see if this class needs to be added all the time or if there is one time where it is not necessary (the less visitors the better performance wise)
| @@ -36,8 +38,10 @@ | |||
| private $constants; | |||
theofidry
commented
Jun 30, 2018
| @@ -93,7 +93,7 @@ public function enterNode(Node $node): Node | |||
| private function shouldPrefixScalar(Node $node, bool &$isSpecialFunction): bool | |||
| { | |||
| if (false === ($node instanceof String_ && AppendParentNode::hasParent($node) && is_string($node->value)) | |||
| || 1 !== preg_match('/^((\\\\)?[\p{L}_]+)|((\\\\)?(?:[\p{L}_]+\\\\+)+[\p{L}_]+)$/u', $node->value) | |||
| || 1 !== preg_match('/^((\\\\)?[\p{L}_]+)$|((\\\\)?(?:[\p{L}_]+\\\\+)+[\p{L}_]+)$/u', $node->value) | |||
There was a problem hiding this comment.
is a separate bug and should be fixed in a dedicated PR
theofidry
force-pushed
the
feature/whitelist-global-functions
branch
from
8a8736a to
60e768b
Compare
theofidry
force-pushed
the
feature/whitelist-global-functions
branch
from
2d19d01 to
1347997
Compare
theofidry
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #226
Besides the comment review, this is missing: