From d6ae3d90b73d8f14d0ddcc9dd80bf25a84c03933 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 18 Sep 2021 11:59:41 +0100
Subject: [PATCH 1/8] #125 - Rename PHP_ZEPHIR_PARSER_NAME to `zephir_parser`
---
zephir_parser.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zephir_parser.h b/zephir_parser.h
index 95c96bb5..a21afddf 100644
--- a/zephir_parser.h
+++ b/zephir_parser.h
@@ -14,7 +14,7 @@
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_NAME "zephir_parser"
#define PHP_ZEPHIR_PARSER_VERSION "1.4.0"
#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."
From 726747f0a9e65691a7b15a5d38b9904a5a63147a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 18 Sep 2021 12:03:16 +0100
Subject: [PATCH 2/8] Update CHANGELOG.md
---
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f777c233..f8ea4d64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
+### 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
From 118b49a722316ffc1153cf3d79691df986b487a0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 18 Sep 2021 12:04:18 +0100
Subject: [PATCH 3/8] #125 - Update extension name in CI
---
.github/workflows/ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d8d4722e..7faf9ccc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
@@ -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
From c330e2b135c1627d7e87135c7d7bbacc4a89fd4a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 18 Sep 2021 12:15:08 +0100
Subject: [PATCH 4/8] #125 - Update extension name in CI
---
.ci/win-ci-tools.psm1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/win-ci-tools.psm1 b/.ci/win-ci-tools.psm1
index 19869b11..2d63a637 100644
--- a/.ci/win-ci-tools.psm1
+++ b/.ci/win-ci-tools.psm1
@@ -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 {
From e24be96532c7c6f56dab92e14b740b75babb430e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 18 Sep 2021 12:15:25 +0100
Subject: [PATCH 5/8] #125 - Update tests
---
tests/base/extension_info.phpt | 6 +++---
tests/skipif.inc | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/base/extension_info.phpt b/tests/base/extension_info.phpt
index 79e55438..e74f66a2 100644
--- a/tests/base/extension_info.phpt
+++ b/tests/base/extension_info.phpt
@@ -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;
@@ -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;
@@ -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 =>
diff --git a/tests/skipif.inc b/tests/skipif.inc
index 408b40d6..1b95f3bf 100644
--- a/tests/skipif.inc
+++ b/tests/skipif.inc
@@ -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"; ?>
From 144938c7245835484074297096e1800bd3f6dc7e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 18 Sep 2021 14:07:29 +0100
Subject: [PATCH 6/8] #127 - Add tests files into `contents`
---
package.xml | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 156 insertions(+)
diff --git a/package.xml b/package.xml
index 8a7a31b2..2f61edc5 100644
--- a/package.xml
+++ b/package.xml
@@ -43,6 +43,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"/>
From d1f9a13232a02d6f1249df4117af734774b0b405 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 18 Sep 2021 14:22:20 +0100
Subject: [PATCH 7/8] Update version and notes in package.xml
---
package.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/package.xml b/package.xml
index 2f61edc5..312ee067 100644
--- a/package.xml
+++ b/package.xml
@@ -13,10 +13,10 @@
<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>
@@ -24,12 +24,11 @@
</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="/">
From 6453eaae7ea2273a1a24d9c9c067c2cf09e084d8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 18 Sep 2021 14:23:42 +0100
Subject: [PATCH 8/8] Bump version to `1.4.1`
---
CHANGELOG.md | 5 ++++-
VERSION | 2 +-
zephir_parser.h | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8ea4d64..721e6398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
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)
@@ -175,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
diff --git a/VERSION b/VERSION
index 88c5fb89..347f5833 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.0
+1.4.1
diff --git a/zephir_parser.h b/zephir_parser.h
index a21afddf..3cccd21d 100644
--- a/zephir_parser.h
+++ b/zephir_parser.h
@@ -15,7 +15,7 @@ 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_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."