Skip to content

Commit ca05f10

Browse files
authored
Merge pull request #27 from phalcon/development
1.1.0
2 parents 8b11ce1 + 7646156 commit ca05f10

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+533
-931
lines changed

.appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# --
2-
version: 1.0.3-{build}
1+
version: 1.0.4-{build}
32

43
build: false
54
environment:

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ tests/*/*.exp
4343
tests/*/*.log
4444
tests/*/*.sh
4545

46+
php_test_results_*
47+
4648
# Parser files
4749
parser/lemon
4850
parser/scanner.c
@@ -54,6 +56,4 @@ parser/parser.php7.c
5456
parser/parser.php7.h
5557
parser/parser.php7.out
5658

57-
vendor
58-
composer.lock
59-
phpunit.xml
59+
release

.travis.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,13 @@ matrix:
4040
cache:
4141
apt: true
4242
timeout: 691200
43-
directories:
44-
- vendor
45-
- $HOME/.composer/cache
4643

4744
install:
4845
- phpenv config-rm xdebug.ini || true
49-
- bash ./unit-tests/ci/install-travis
50-
- composer install --quiet --no-interaction --no-ansi --no-progress --optimize-autoloader --dev --prefer-dist --no-suggest --ignore-platform-reqs
51-
52-
before_install:
53-
- if [[ ! -z "${GH_TOKEN}" ]]; then composer config github-oauth.github.com ${GH_TOKEN}; echo "Configured Github token"; fi;
46+
- bash ./install-development
5447

5548
script:
56-
- php --ri "Zephir Parser"
57-
- valgrind --read-var-info=yes --error-exitcode=1 --fullpath-after= --track-origins=yes --leak-check=full --num-callers=20 --suppressions=unit-tests/ci/zephir_parser.3.7.0.sup $(phpenv which php) ./unit-tests/phpunit -c phpunit.xml.dist --debug unit-tests/
49+
- valgrind --read-var-info=yes --error-exitcode=1 --fullpath-after= --track-origins=yes --leak-check=full --num-callers=20 --suppressions=$(pwd)/tests/zephir_parser.3.7.0.sup $(phpenv which php) -d variables_order=EGPCS run-tests.php -p $(which php) -d extension=$(pwd)/modules/zephir_parser.so -d variables_order=EGPCS -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
5850

5951
notifications:
6052
email:

CHANGELOG.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased]
88

9+
## [1.1.0] - 2017-10-12
10+
### Added
11+
- Added support syntax assign-bitwise operators [#14](https://github.com/phalcon/php-zephir-parser/issues/14),
12+
[phalcon/zephir#1056](https://github.com/phalcon/zephir/issues/1056)
13+
14+
### Changed
15+
- Refactor tests to use more standard approach usually used for PHP extensions
16+
917
## [1.0.3] - 2017-05-13
1018
### Added
11-
- Make parser return error message on failure
12-
- Added support of `$_ENV` global var [#1224](https://github.com/phalcon/zephir/issues/1224)
19+
- Make parser return error message on failure [#19](https://github.com/phalcon/php-zephir-parser/issues/19)
20+
- Added support of `$_ENV` global var [phalcon/zephir#1224](https://github.com/phalcon/zephir/issues/1224)
1321
- Amended tests
1422

1523
### Changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2013-2017 Zephir Team and contributors
3+
Copyright (c) 2013-present Zephir Team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.WIN32-BUILD-SYSTEM

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ Parts which are only necessary for a specific PHP version, are marked as such.
2222
* Make sure it is in the PATH, as for example below:
2323
setx path "%path%;c:\path-to-php\"
2424

25-
* Install PHP SDK: http://windows.php.net/downloads/php-sdk/
25+
* Install PHP SDK for PHP 5.6: http://windows.php.net/downloads/php-sdk/
2626
(Currently `php-sdk-binary-tools-20110915.zip` is the newest):
2727
setx php_sdk "c:\path-to-php-sdk"
28+
* Install PHP SDK 2.0 for PHP 7.0+: https://github.com/OSTC/php-sdk-binary-tools
2829

2930
* Download PHP Developer Pack(NTS!): http://windows.php.net/downloads/releases/
3031
(Or build it yourself with `--enable-debug --disable-zts` and `nmake build-devel`,

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ The Zephir Parser delivered as a C extension for the PHP language.
77

88
Supported PHP versions: **5.5**, **5.6**, **7.0**, **7.1**, **7.2**
99

10+
**NOTE:** The `development` branch will always contain the latest **unstable** version.
11+
If you wish to check older versions or formal, tagged release, please switch to the relevant
12+
[branch](https://github.com/phalcon/php-zephir-parser/branches)/[tag](https://github.com/phalcon/php-zephir-parser/tags).
13+
1014
## Get Started
1115

1216
### Windows

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.3
1+
1.0.4

composer.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

install

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
#!/usr/bin/env bash
22
#
33
# Zephir Parser
4+
# Copyright (c) 2013-present Zephir Team (https://zephir-lang.com/)
45
#
5-
# Copyright (c) 2013-2017 Zephir Team and contributors
6-
#
7-
# This source file is subject the MIT license, that is bundled with
8-
# this package in the file LICENSE, and is available through the
9-
# world-wide-web at the following url:
10-
# http://zephir-lang.com/license.html
11-
#
12-
# If you did not receive a copy of the MIT license and are unable
13-
# to obtain it through the world-wide-web, please send a note to
14-
# [email protected] so we can mail you a copy immediately.
6+
# This source file is subject the MIT license, that is bundled with this
7+
# package in the file LICENSE, and is available through the world-wide-web
8+
# at the following url: http://zephir-lang.com/license.html
159

1610
# Available params:
1711
# --phpize

0 commit comments

Comments
 (0)