Skip to content

Commit

Permalink
Merge pull request #97 from phalcon/development
Browse files Browse the repository at this point in the history
1.3.5
  • Loading branch information
AlexNDRmac authored Nov 29, 2020
2 parents 3cdd0eb + c703f67 commit dfe7669
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.3.3-{build}
version: 1.3.5-{build}

environment:
matrix:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ jobs:
- '7.1'
- '7.3'
- '7.4'
- '8.0'
name:
- Ubuntu
- macOS

include:
- name: Ubuntu
os: ubuntu-latest
os: ubuntu-18.04
ccov: ON

- name: macOS
Expand Down Expand Up @@ -78,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'
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.4
1.3.5
38 changes: 38 additions & 0 deletions tests/base/extension_info.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--TEST--
Test extension info
--SKIPIF--
<?php include(__DIR__ . '/../skipif.inc'); ?>
--FILE--
<?php

function contains($input, $expected) {
return strpos($input, $expected) !== false
? $expected
: 'not contains';
}

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

$compare = $version === $actual;
var_dump($compare);

ob_start();
phpinfo(INFO_MODULES);
$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, '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 =>
8 changes: 7 additions & 1 deletion zephir_parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
/* }}} */
Expand Down
6 changes: 5 additions & 1 deletion zephir_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand All @@ -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

0 comments on commit dfe7669

Please sign in to comment.