Skip to content

Commit

Permalink
Merge pull request #129 from zephir-lang/development
Browse files Browse the repository at this point in the history 
1.4.1
  • Loading branch information
@Jeckerson
Jeckerson authored Sep 18, 2021
2 parents 70eee9e + 6453eaa commit 08a0a99
Show file tree
Hide file tree
Showing 8 changed files with 178 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .ci/win-ci-tools.psm1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function EnableExtension {

Copy-Item -Path "${env:RELEASE_DLL_PATH}" -Destination "${env:PHPROOT}\ext\"

Enable-PhpExtension -Extension 'Zephir Parser' -Path "${env:PHPROOT}"
Enable-PhpExtension -Extension zephir_parser -Path "${env:PHPROOT}"
}

function PrepareReleasePackage {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
- name: Run Tests
if: matrix.arch == 'x64'
run: |
& ${env:TEST_PHP_EXECUTABLE} --ri 'Zephir Parser'
& ${env:TEST_PHP_EXECUTABLE} --ri zephir_parser
& ${env:TEST_PHP_EXECUTABLE} run-tests.php
- name: Prepare Release Package
Expand Down Expand Up @@ -321,7 +321,7 @@ jobs:

- name: Run Tests
run: |
php -d extension=./modules/zephir_parser.so --ri 'Zephir Parser'
php -d extension=./modules/zephir_parser.so --ri zephir_parser
make test NO_INTERACTION=1 REPORT_EXIT_STATUS=1
- name: Print failures
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.4.1] - 2021-09-18
### Changed
- Renamed extension name from `Zephir Parser` to `zephir_parser` [#125](https://github.com/phalcon/php-zephir-parser/issues/125)

## [1.4.0] - 2021-09-18
### Added
- Added support for `mixed` type [#120](https://github.com/phalcon/php-zephir-parser/issues/120)
Expand Down Expand Up @@ -173,7 +177,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added
- Initial stable release

[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.4.0...HEAD
[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.4.1...HEAD
[1.4.1]: https://github.com/phalcon/php-zephir-parser/compare/v1.4.0...v1.4.1
[1.4.0]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.8...v1.4.0
[1.3.8]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.7...v1.3.8
[1.3.7]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.6...v1.3.7
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.0
1.4.1
169 changes: 162 additions & 7 deletions package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,22 @@
<active>yes</active>
</lead>
<date>2021-09-18</date>
<time>11:00:00</time>
<time>15:00:00</time>
<version>
<release>1.4.0</release>
<api>1.4.0</api>
<release>1.4.1</release>
<api>1.4.1</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="https://github.com/zephir-lang/php-zephir-parser/blob/development/LICENSE">MIT</license>
<notes>
Sat, Sep 18, 2021 - Zephir Parser 1.4.0
Sat, Sep 18, 2021 - Zephir Parser 1.4.1

= New features:
= Changes:

- Fixed issue #120: Add support for `mixed` type
- Fixed issue #118: Add support for `yield` statement
- Fixed issue #125: Renamed extension name from `Zephir Parser` to `zephir_parser`
</notes>
<contents>
<dir name="/">
Expand All @@ -43,6 +42,162 @@
<file name="zephir.h" role="src"/>
</dir>

<div name="tests">
<div name="base">
<file name="cblocks.phpt" role="test"/>
<file name="declare.phpt" role="test"/>
<file name="empty01.phpt" role="test"/>
<file name="empty02.phpt" role="test"/>
<file name="extension_info.phpt" role="test"/>
<file name="literals.phpt" role="test"/>
<file name="types.phpt" role="test"/>
<file name="variables.phpt" role="test"/>
</div>

<div name="cf">
<file name="do-while.phpt" role="test"/>
<file name="for.phpt" role="test"/>
<file name="if.phpt" role="test"/>
<file name="loop.phpt" role="test"/>
<file name="switch.phpt" role="test"/>
<file name="try-catch01.phpt" role="test"/>
<file name="try-catch02.phpt" role="test"/>
<file name="try-catch03.phpt" role="test"/>
<file name="while01.phpt" role="test"/>
</div>

<div name="classes">
<file name="bug48.phpt" role="test"/>
<file name="constant.phpt" role="test"/>
<file name="interface.phpt" role="test"/>
<file name="method-visibility.phpt" role="test"/>
</div>

<div name="comments">
<div name="dockblocks">
<file name="bug13.phpt" role="test"/>
<file name="empty.phpt" role="test"/>
<file name="simple.phpt" role="test"/>
</div>

<file name="comment.phpt" role="test"/>
<file name="comments_before.phpt" role="test"/>
<file name="empty.phpt" role="test"/>
<file name="sl_comment.phpt" role="test"/>
</div>

<div name="errors">
<file name="001.phpt" role="test"/>
<file name="bug30.phpt" role="test"/>
</div>

<div name="functions">
<div name="closures">
<file name="closure_arrow.phpt" role="test"/>
<file name="empty_closure.phpt" role="test"/>
<file name="empty_closure_with_body.phpt" role="test"/>
<file name="non_empty_closure_with_use.phpt" role="test"/>
<file name="non_empty_closure_with_use_and_body.phpt" role="test"/>
<file name="preg_replace_callback.phpt" role="test"/>
</div>

<div name="parameter-types">
<file name="int.phpt" role="test"/>
<file name="mixed.phpt" role="test"/>
</div>

<div name="return-types">
<file name="int.phpt" role="test"/>
<file name="mixed.phpt" role="test"/>
</div>

<file name="definition01.phpt" role="test"/>
<file name="definition02.phpt" role="test"/>
<file name="definition03.phpt" role="test"/>
<file name="definition04.phpt" role="test"/>
</div>

<div name="globals">
<file name="001.phpt" role="test"/>
</div>

<div name="namespaces">
<file name="001.phpt" role="test"/>
<file name="002.phpt" role="test"/>
<file name="003.phpt" role="test"/>
<file name="004.phpt" role="test"/>
</div>

<div name="operators">
<div name="assignments">
<file name="bitwise.phpt" role="test"/>
<file name="concat.phpt" role="test"/>
<file name="div.phpt" role="test"/>
<file name="mod.phpt" role="test"/>
<file name="mul.phpt" role="test"/>
<file name="sub.phpt" role="test"/>
</div>

<file name="and.phpt" role="test"/>
<file name="bitwise.phpt" role="test"/>
<file name="bug89.phpt" role="test"/>
<file name="comparison.phpt" role="test"/>
<file name="decr.phpt" role="test"/>
<file name="div.phpt" role="test"/>
<file name="dot.phpt" role="test"/>
<file name="erange.phpt" role="test"/>
<file name="incr.phpt" role="test"/>
<file name="instanceof.phpt" role="test"/>
<file name="irange.phpt" role="test"/>
<file name="mod.phpt" role="test"/>
<file name="mul.phpt" role="test"/>
<file name="negation.phpt" role="test"/>
<file name="new01.phpt" role="test"/>
<file name="new02.phpt" role="test"/>
<file name="new03.phpt" role="test"/>
<file name="new04.phpt" role="test"/>
<file name="not.phpt" role="test"/>
<file name="or.phpt" role="test"/>
<file name="special.phpt" role="test"/>
<file name="static-constant-access.phpt" role="test"/>
<file name="static-property-access.phpt" role="test"/>
<file name="sub.phpt" role="test"/>
<file name="ternary.phpt" role="test"/>
</div>

<div name="statements">
<div name="yield">
<file name="empty-yield.phpt" role="test"/>
<file name="yield-array.phpt" role="test"/>
<file name="yield-closure.phpt" role="test"/>
<file name="yield-key-value.phpt" role="test"/>
<file name="yield-key-value-variables.phpt" role="test"/>
<file name="yield-value.phpt" role="test"/>
</div>

<file name="break.phpt" role="test"/>
<file name="continue.phpt" role="test"/>
<file name="empty.phpt" role="test"/>
<file name="fcall.phpt" role="test"/>
<file name="fetch.phpt" role="test"/>
<file name="mcall.phpt" role="test"/>
<file name="require.phpt" role="test"/>
<file name="require_once.phpt" role="test"/>
<file name="return.phpt" role="test"/>
<file name="scall.phpt" role="test"/>
<file name="throw.phpt" role="test"/>
<file name="unset.phpt" role="test"/>
</div>

<div name="unicode">
<file name="bug56.phpt" role="test"/>
<file name="bug62.phpt" role="test"/>
</div>

<file name="skipif.inc" role="test"/>
<file name="skipifwin32.inc" role="test"/>
</div>

<file name="config.m4" role="src"/>
<file name="config.w32" role="src"/>
<file name="zephir_parser.c" role="src"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/base/extension_info.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function contains($input, $expected) {
: 'not contains';
}

$version = phpversion('Zephir Parser');
$version = phpversion('zephir_parser');
$actual = trim(file_get_contents(__DIR__ . '/../../VERSION'));

$compare = $version === $actual;
Expand All @@ -23,7 +23,7 @@ $info = trim(ob_get_clean());

echo contains($info, 'Zephir Parser').PHP_EOL;
echo contains($info, 'The Zephir Parser delivered as a C extension for the PHP language.').PHP_EOL;
echo contains($info, 'Zephir Parser => enabled').PHP_EOL;
echo contains($info, 'zephir_parser => enabled').PHP_EOL;
echo contains($info, 'Author => Zephir Team and contributors').PHP_EOL;
echo contains($info, 'Version =>').PHP_EOL;
echo contains($info, 'Build Date =>').PHP_EOL;
Expand All @@ -32,7 +32,7 @@ echo contains($info, 'Build Date =>').PHP_EOL;
bool(true)
Zephir Parser
The Zephir Parser delivered as a C extension for the PHP language.
Zephir Parser => enabled
zephir_parser => enabled
Author => Zephir Team and contributors
Version =>
Build Date =>
2 changes: 1 addition & 1 deletion tests/skipif.inc
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php if (!extension_loaded("Zephir Parser")) print "skip The zephir_parser extension is not loaded"; ?>
<?php if (!extension_loaded("zephir_parser")) print "skip The zephir_parser extension is not loaded"; ?>
4 changes: 2 additions & 2 deletions zephir_parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
extern zend_module_entry zephir_parser_module_entry;
#define phpext_zephir_parser_ptr &zephir_parser_module_entry

#define PHP_ZEPHIR_PARSER_NAME "Zephir Parser"
#define PHP_ZEPHIR_PARSER_VERSION "1.4.0"
#define PHP_ZEPHIR_PARSER_NAME "zephir_parser"
#define PHP_ZEPHIR_PARSER_VERSION "1.4.1"
#define PHP_ZEPHIR_PARSER_AUTHOR "Zephir Team and contributors"
#define PHP_ZEPHIR_PARSER_DESCRIPTION "The Zephir Parser delivered as a C extension for the PHP language."

Expand Down

0 comments on commit 08a0a99

Please sign in to comment.