Skip to content

Commit dfe7669

Browse files
authored
Merge pull request #97 from phalcon/development
1.3.5
2 parents 3cdd0eb + c703f67 commit dfe7669

File tree

7 files changed

+65
-11
lines changed

7 files changed

+65
-11
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 1.3.3-{build}
1+
version: 1.3.5-{build}
22

33
environment:
44
matrix:

.github/workflows/main.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ jobs:
2727
- '7.1'
2828
- '7.3'
2929
- '7.4'
30+
- '8.0'
3031
name:
3132
- Ubuntu
3233
- macOS
3334

3435
include:
3536
- name: Ubuntu
36-
os: ubuntu-latest
37+
os: ubuntu-18.04
3738
ccov: ON
3839

3940
- name: macOS
@@ -78,10 +79,10 @@ jobs:
7879
mkdir -p $HOME/.cache/re2c
7980
mkdir -p $HOME/.local/opt/re2c
8081
81-
echo "::set-env name=RE2C_VERSION::${{ matrix.re2c }}"
82-
echo "::set-env name=PATH::$PATH:$HOME/bin:$(brew --prefix lcov)/bin"
83-
echo "::set-env name=MAKEFLAGS::-j$(getconf _NPROCESSORS_ONLN)"
84-
echo "::set-env name=CI::true"
82+
echo "RE2C_VERSION=${{ matrix.re2c }}" >> $GITHUB_ENV
83+
echo "PATH=$PATH:$HOME/bin:$(brew --prefix lcov)/bin" >> $GITHUB_ENV
84+
echo "MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN)" >> $GITHUB_ENV
85+
echo "CI=true" >> $GITHUB_ENV
8586
8687
- name: Setup Core Dump (Linux)
8788
if: runner.os == 'Linux'

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased]
8+
9+
## [1.3.5] - 2020-11-29
10+
### Added
11+
- Added PHP 8.0 support [phalcon/zephir#2111](https://github.com/phalcon/zephir/issues/2111)
12+
813
## [1.3.4] - 2020-04-04
914
### Fixed
1015
- Fixed operator precedence
@@ -151,8 +156,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
151156
### Added
152157
- Initial stable release
153158

154-
[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.4...HEAD
155-
[1.3.4]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.3...v1.3.4
159+
[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.5...HEAD
160+
[1.3.5]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.4...v1.3.5
156161
[1.3.3]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.2...v1.3.3
157162
[1.3.2]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.1...v1.3.2
158163
[1.3.1]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.0...v1.3.1

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.4
1+
1.3.5

tests/base/extension_info.phpt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
--TEST--
2+
Test extension info
3+
--SKIPIF--
4+
<?php include(__DIR__ . '/../skipif.inc'); ?>
5+
--FILE--
6+
<?php
7+
8+
function contains($input, $expected) {
9+
return strpos($input, $expected) !== false
10+
? $expected
11+
: 'not contains';
12+
}
13+
14+
$version = phpversion('Zephir Parser');
15+
$actual = trim(file_get_contents(__DIR__ . '/../../VERSION'));
16+
17+
$compare = $version === $actual;
18+
var_dump($compare);
19+
20+
ob_start();
21+
phpinfo(INFO_MODULES);
22+
$info = trim(ob_get_clean());
23+
24+
echo contains($info, 'Zephir Parser').PHP_EOL;
25+
echo contains($info, 'The Zephir Parser delivered as a C extension for the PHP language.').PHP_EOL;
26+
echo contains($info, 'Zephir Parser => enabled').PHP_EOL;
27+
echo contains($info, 'Author => Zephir Team and contributors').PHP_EOL;
28+
echo contains($info, 'Version =>').PHP_EOL;
29+
echo contains($info, 'Build Date =>').PHP_EOL;
30+
?>
31+
--EXPECT--
32+
bool(true)
33+
Zephir Parser
34+
The Zephir Parser delivered as a C extension for the PHP language.
35+
Zephir Parser => enabled
36+
Author => Zephir Team and contributors
37+
Version =>
38+
Build Date =>

zephir_parser.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,18 @@ PHP_MINFO_FUNCTION(zephir_parser)
8585
}
8686
/* }}} */
8787

88+
89+
ZEND_BEGIN_ARG_INFO_EX(arginfo_zephir_parse_file, 0, 0, 2)
90+
ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
91+
ZEND_ARG_TYPE_INFO(0, filepath, IS_STRING, 0)
92+
ZEND_END_ARG_INFO()
93+
8894
/* {{{ zephir_parser_functions[]
8995
*
9096
* Every user visible function must have an entry in zephir_parser_functions[].
9197
*/
9298
static const zend_function_entry zephir_parser_functions[] = {
93-
PHP_FE(zephir_parse_file, NULL)
99+
PHP_FE(zephir_parse_file, arginfo_zephir_parse_file)
94100
PHP_FE_END
95101
};
96102
/* }}} */

zephir_parser.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern zend_module_entry zephir_parser_module_entry;
1515
#define phpext_zephir_parser_ptr &zephir_parser_module_entry
1616

1717
#define PHP_ZEPHIR_PARSER_NAME "Zephir Parser"
18-
#define PHP_ZEPHIR_PARSER_VERSION "1.3.4"
18+
#define PHP_ZEPHIR_PARSER_VERSION "1.3.5"
1919
#define PHP_ZEPHIR_PARSER_AUTHOR "Zephir Team and contributors"
2020
#define PHP_ZEPHIR_PARSER_DESCRIPTION "The Zephir Parser delivered as a C extension for the PHP language."
2121

@@ -37,4 +37,8 @@ extern zend_module_entry zephir_parser_module_entry;
3737
ZEND_TSRMLS_CACHE_EXTERN();
3838
#endif
3939

40+
#ifndef TSRMLS_CC
41+
# define TSRMLS_CC
42+
#endif
43+
4044
#endif

0 commit comments

Comments
 (0)