Allow to have no macros in Compiler #177
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
|
Ou shit, nette/tester v2.0 requires >=5.6. My mistake. |
dg
reviewed
May 16, 2018
composer.json
Outdated
| @@ -20,7 +20,7 @@ | |||
| "ext-tokenizer": "*" | |||
| }, | |||
| "require-dev": { | |||
| "nette/tester": "~1.7", | |||
| "nette/tester": "^2.0.1", | |||
There was a problem hiding this comment.
Please leave 1.7, it must work with PHP 5.4
dg
reviewed
May 16, 2018
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): []); | |||
There was a problem hiding this comment.
Exited with error code 255 (expected 0)
E_WARNING: array_merge() expects at least 1 parameter, 0 given
dg
reviewed
May 16, 2018
| @@ -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) { | |||
There was a problem hiding this comment.
Yep, it triggers
Exited with error code 255 (expected 0)
E_WARNING: array_merge() expects at least 1 parameter, 0 given
|
Please fix coding style errors and I'll merge it. |
|
Thanks. |
dg
pushed a commit
that referenced
this issue
May 16, 2018
dg
pushed a commit
that referenced
this issue
May 17, 2018
dg
pushed a commit
that referenced
this issue
Jun 3, 2018
dg
pushed a commit
that referenced
this issue
Oct 6, 2018
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.
This PR has 2 changes: