Skip to content

Commit

Permalink
Merge pull request #2260 from zephir-lang/development
Browse files Browse the repository at this point in the history
0.14.0-beta.2
  • Loading branch information
Jeckerson authored Aug 6, 2021
2 parents a4c95c7 + cd6bcd2 commit 68df5a5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org).

## [Unreleased]

## [0.14.0-beta.2] - 2021-08-06
### Fixed
- Fixed missing `config/` directory in `zephir.phar` [#2259](https://github.com/zephir-lang/zephir/issues/2259)

## [0.14.0-beta.1] - 2021-08-06
### Fixed
- Fixed nullable dynamic argument definition [#2245](https://github.com/zephir-lang/zephir/issues/2245)
Expand Down Expand Up @@ -526,7 +530,8 @@ and this project adheres to [Semantic Versioning](http://semver.org).
[#1524](https://github.com/zephir-lang/zephir/issues/1524)


[Unreleased]: https://github.com/zephir-lang/zephir/compare/0.14.0-beta.1...HEAD
[Unreleased]: https://github.com/zephir-lang/zephir/compare/0.14.0-beta.2...HEAD
[0.14.0-beta.1]: https://github.com/zephir-lang/zephir/compare/0.14.0-beta.1...0.14.0-beta.2
[0.14.0-beta.1]: https://github.com/zephir-lang/zephir/compare/0.13.5...0.14.0-beta.1
[0.13.5]: https://github.com/zephir-lang/zephir/compare/0.13.4...0.13.5
[0.13.4]: https://github.com/zephir-lang/zephir/compare/0.13.3...0.13.4
Expand Down
2 changes: 1 addition & 1 deletion Library/Zephir.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
final class Zephir
{
public const VERSION = '0.14.0-beta.1-$Id$';
public const VERSION = '0.14.0-beta.2-$Id$';

public const LOGO = <<<'ASCII'
_____ __ _
Expand Down
4 changes: 4 additions & 0 deletions box.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
"stub"
],
"finder": [
{
"in": "config",
"name": "*.*"
},
{
"in": "kernels",
"name": "*.*"
Expand Down
10 changes: 5 additions & 5 deletions ext/php_stub.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
#define PHP_STUB_VERSION "1.0.0"
#define PHP_STUB_EXTNAME "stub"
#define PHP_STUB_AUTHOR "Phalcon Team and contributors"
#define PHP_STUB_ZEPVERSION "0.14.0-beta.1-$Id$"
#define PHP_STUB_ZEPVERSION "0.14.0-beta.2-$Id$"
#define PHP_STUB_DESCRIPTION "Description <b>test</b> for<br/>Test Extension."

typedef struct _zephir_struct_db {
typedef struct _zephir_struct_db {
zend_bool my_setting_1;
int my_setting_2;
double my_setting_3;
} zephir_struct_db;

typedef struct _zephir_struct_orm {
typedef struct _zephir_struct_orm {
int cache_level;
zend_bool cache_enable;
} zephir_struct_orm;

typedef struct _zephir_struct_extension {
typedef struct _zephir_struct_extension {
zend_bool test_ini_variable;
} zephir_struct_extension;

Expand All @@ -49,7 +49,7 @@ ZEND_BEGIN_MODULE_GLOBALS(stub)
/* Max recursion control */
unsigned int recursive_lock;


zephir_struct_db db;

zephir_struct_orm orm;
Expand Down

0 comments on commit 68df5a5

Please sign in to comment.