Skip to content

Commit

Permalink
Merge pull request #2123 from phalcon/bugfix/implode-params-for-php74
Browse files Browse the repository at this point in the history
Bugfix/implode params for php74
  • Loading branch information
AlexNDRmac authored Nov 20, 2020
2 parents 732e9be + 52d81b2 commit dbc3942
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org).
## [Unreleased]
### Fixed
- Fixed stubs generation for case with array declaration with square brackets in params
- Fixed parameters positioning for `implode()` php function [#2120](https://github.com/phalcon/zephir/issues/2120)

## [0.12.19] - 2020-05-13
### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Library/Compiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ public function compile($development = false)
$hasChanged = false;

if (false === strpos($configureFile, $fixMarker)) {
$configureFile = $fixMarker.PHP_EOL.implode($configureFix, PHP_EOL).PHP_EOL.$configureFile;
$configureFile = $fixMarker.PHP_EOL.implode(PHP_EOL, $configureFix).PHP_EOL.$configureFile;
$hasChanged = true;
}

Expand Down
2 changes: 1 addition & 1 deletion Library/CompilerFileAnonymous.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private function compileClass(CompilationContext $compilationContext)
}

if (\count($this->headerCBlocks) > 0) {
$code .= implode($this->headerCBlocks, PHP_EOL).PHP_EOL;
$code .= implode(PHP_EOL, $this->headerCBlocks).PHP_EOL;
}

/*
Expand Down

0 comments on commit dbc3942

Please sign in to comment.