Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.
Sign upAllow to have no macros in Compiler #177
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
|
Ou shit, nette/tester v2.0 requires >=5.6. My mistake. |
composer.json
Outdated
| @@ -20,7 +20,7 @@ | |||
| "ext-tokenizer": "*" | |||
| }, | |||
| "require-dev": { | |||
| "nette/tester": "~1.7", | |||
| "nette/tester": "^2.0.1", | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
src/Latte/Compiler/Compiler.php
Outdated
| @@ -124,7 +124,7 @@ public function compile(array $tokens, $className) | |||
| $this->methods = ['main' => null, 'prepare' => null]; | |||
|
|
|||
| $macroHandlers = new \SplObjectStorage; | |||
| array_map([$macroHandlers, 'attach'], call_user_func_array('array_merge', $this->macros)); | |||
| array_map([$macroHandlers, 'attach'], $this->macros ? call_user_func_array('array_merge', $this->macros): []); | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
f3l1x
May 16, 2018
Author
Member
Exited with error code 255 (expected 0)
E_WARNING: array_merge() expects at least 1 parameter, 0 given
| @@ -124,7 +124,10 @@ public function compile(array $tokens, $className) | |||
| $this->methods = ['main' => null, 'prepare' => null]; | |||
|
|
|||
| $macroHandlers = new \SplObjectStorage; | |||
| array_map([$macroHandlers, 'attach'], call_user_func_array('array_merge', $this->macros)); | |||
|
|
|||
| if ($this->macros) { | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
f3l1x
May 16, 2018
Author
Member
Yep, it triggers
Exited with error code 255 (expected 0)
E_WARNING: array_merge() expects at least 1 parameter, 0 given
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Please fix coding style errors and I'll merge it. |
This comment has been minimized.
This comment has been minimized.
|
Thanks. |
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.
f3l1x commentedMay 16, 2018
•
edited
This PR has 2 changes: