From 037fc9f6f1ac4fc22ae72d0efab549f7418d3d26 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Sat, 4 Apr 2020 19:21:47 +0300 Subject: [PATCH 1/8] Bump version --- .appveyor.yml | 2 +- VERSION | 2 +- zephir_parser.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 98e183d3..fa2c7a92 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 1.3.3-{build} +version: 1.3.5-{build} environment: matrix: diff --git a/VERSION b/VERSION index d0149fef..80e78df6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.4 +1.3.5 diff --git a/zephir_parser.h b/zephir_parser.h index aa775107..ff3fedbb 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.3.4" +#define PHP_ZEPHIR_PARSER_VERSION "1.3.5" #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 1e765d5c28c6cff4c442f90030f013620808fe62 Mon Sep 17 00:00:00 2001 From: dreamsxin Date: Mon, 28 Sep 2020 14:14:44 +0800 Subject: [PATCH 2/8] Updated --- zephir_parser.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zephir_parser.h b/zephir_parser.h index ff3fedbb..a892401c 100644 --- a/zephir_parser.h +++ b/zephir_parser.h @@ -37,4 +37,8 @@ extern zend_module_entry zephir_parser_module_entry; ZEND_TSRMLS_CACHE_EXTERN(); #endif +#ifndef TSRMLS_CC +# define TSRMLS_CC +#endif + #endif From 9f8cbf3d5213b1703197248b44f42dba38cc1e5e Mon Sep 17 00:00:00 2001 From: dreamsxin Date: Mon, 28 Sep 2020 14:42:36 +0800 Subject: [PATCH 3/8] Updated --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ed7954b..469f2ee8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,7 @@ jobs: - '7.1' - '7.3' - '7.4' + - '8.0' name: - Ubuntu - macOS From 5d30b87ae424f18c3f0cba4456d6d99a8f3cb0d8 Mon Sep 17 00:00:00 2001 From: dreamsxin Date: Wed, 30 Sep 2020 09:08:45 +0800 Subject: [PATCH 4/8] Updated --- zephir_parser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/zephir_parser.c b/zephir_parser.c index c1bd48c4..f940b850 100644 --- a/zephir_parser.c +++ b/zephir_parser.c @@ -85,12 +85,18 @@ PHP_MINFO_FUNCTION(zephir_parser) } /* }}} */ + +ZEND_BEGIN_ARG_INFO_EX(arginfo_zephir_parse_file, 0, 0, 2) + ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filepath, IS_STRING, 0) +ZEND_END_ARG_INFO() + /* {{{ zephir_parser_functions[] * * Every user visible function must have an entry in zephir_parser_functions[]. */ static const zend_function_entry zephir_parser_functions[] = { - PHP_FE(zephir_parse_file, NULL) + PHP_FE(zephir_parse_file, arginfo_zephir_parse_file) PHP_FE_END }; /* }}} */ From 5879260b82e54fb3bef9180a016d76e80531de4d Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Sat, 21 Nov 2020 13:38:18 +0200 Subject: [PATCH 5/8] Fix deprecated set-env action syntax for CI --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 469f2ee8..c0fa0a9b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: include: - name: Ubuntu - os: ubuntu-latest + os: ubuntu-18.04 ccov: ON - name: macOS @@ -79,10 +79,10 @@ jobs: mkdir -p $HOME/.cache/re2c mkdir -p $HOME/.local/opt/re2c - echo "::set-env name=RE2C_VERSION::${{ matrix.re2c }}" - echo "::set-env name=PATH::$PATH:$HOME/bin:$(brew --prefix lcov)/bin" - echo "::set-env name=MAKEFLAGS::-j$(getconf _NPROCESSORS_ONLN)" - echo "::set-env name=CI::true" + echo "RE2C_VERSION:={{ matrix.re2c }}" >> $GITHUB_ENV + echo "PATH=$PATH:$HOME/bin:$(brew --prefix lcov)/bin" >> $GITHUB_ENV + echo "MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN)" >> $GITHUB_ENV + echo "CI=true" >> $GITHUB_ENV - name: Setup Core Dump (Linux) if: runner.os == 'Linux' From fb12b7a66239f5bc68043e71e1c52c2e0f504c76 Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Sat, 21 Nov 2020 14:17:07 +0200 Subject: [PATCH 6/8] Amend missed `$` for github actions variable --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c0fa0a9b..c12f5756 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,7 +79,7 @@ jobs: mkdir -p $HOME/.cache/re2c mkdir -p $HOME/.local/opt/re2c - echo "RE2C_VERSION:={{ matrix.re2c }}" >> $GITHUB_ENV + echo "RE2C_VERSION=${{ matrix.re2c }}" >> $GITHUB_ENV echo "PATH=$PATH:$HOME/bin:$(brew --prefix lcov)/bin" >> $GITHUB_ENV echo "MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN)" >> $GITHUB_ENV echo "CI=true" >> $GITHUB_ENV From 6eef9bfb4864d282161cabc51593fa39ae81db4c Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Sat, 21 Nov 2020 16:33:44 +0200 Subject: [PATCH 7/8] Add test for parser MINFO_FUNCTION --- tests/base/extension_info.phpt | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tests/base/extension_info.phpt diff --git a/tests/base/extension_info.phpt b/tests/base/extension_info.phpt new file mode 100644 index 00000000..79e55438 --- /dev/null +++ b/tests/base/extension_info.phpt @@ -0,0 +1,38 @@ +--TEST-- +Test extension info +--SKIPIF-- + +--FILE-- + 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; +?> +--EXPECT-- +bool(true) +Zephir Parser +The Zephir Parser delivered as a C extension for the PHP language. +Zephir Parser => enabled +Author => Zephir Team and contributors +Version => +Build Date => From 849d5161e0da7988cd434d45784c2e1f62ea7e72 Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Sun, 29 Nov 2020 19:22:21 +0200 Subject: [PATCH 8/8] Update change log --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a6b53bb..427f8c5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] + +## [1.3.5] - 2020-11-29 +### Added +- Added PHP 8.0 support [phalcon/zephir#2111](https://github.com/phalcon/zephir/issues/2111) + ## [1.3.4] - 2020-04-04 ### Fixed - Fixed operator precedence @@ -151,8 +156,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.3.4...HEAD -[1.3.4]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.3...v1.3.4 +[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.5...HEAD +[1.3.5]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.4...v1.3.5 [1.3.3]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.2...v1.3.3 [1.3.2]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.1...v1.3.2 [1.3.1]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.0...v1.3.1