Merge pull request #1945 from phalcon/development

0.12.7
zephir-lang · Oct 4, 2019 · 1c107e0 · 1c107e0
2 parents dd5e3f8 + b3277c5
commit 1c107e0
Show file tree

Hide file tree

Showing 20 changed files with 152 additions and 264 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -19,9 +19,6 @@ tab_width                = 4
 indent_style             = tab
 tab_width                = 4
 
-[*.md]
-trim_trailing_whitespace = false
-
 [*.{yml,m4,json,xml,sh}]
 indent_size              = 2
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+## [0.12.7] - 2019-10-03
+### Fixed
+- Fixed regression introduced in `0.12.5` for those users who doesn't use
+  bundled `ext/pcre/php_pcre.h`
+  [#1944](https://github.com/phalcon/zephir/issues/1944)
+  [#1940](https://github.com/phalcon/zephir/issues/1940)
+- Fixed sitemap API generator [#1940](https://github.com/phalcon/zephir/issues/1940)
+
 ## [0.12.6] - 2019-10-03
 ### Fixed
 - Fixed regression introduced in `0.12.5` for those users who doesn't use
-  bundled `ext/json/php_json.h` [#1940](https://github.com/phalcon/zephir/issues/1940) 
+  bundled `ext/json/php_json.h` [#1940](https://github.com/phalcon/zephir/issues/1940)
 
 ## [0.12.5] - 2019-10-02
 ### Changed
@@ -247,7 +255,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed casting resource to int (only ZendEngine 3)
   [#1524](https://github.com/phalcon/zephir/issues/1524)
 
-[Unreleased]: https://github.com/phalcon/zephir/compare/0.12.6...HEAD
+[Unreleased]: https://github.com/phalcon/zephir/compare/0.12.7...HEAD
+[0.12.7]: https://github.com/phalcon/zephir/compare/0.12.6...0.12.7
 [0.12.6]: https://github.com/phalcon/zephir/compare/0.12.5...0.12.6
 [0.12.5]: https://github.com/phalcon/zephir/compare/0.12.4...0.12.5
 [0.12.4]: https://github.com/phalcon/zephir/compare/0.12.3...0.12.4

diff --git a/Library/Zephir.php b/Library/Zephir.php
@@ -16,7 +16,7 @@
  */
 final class Zephir
 {
-    const VERSION = '0.12.6-$Id$';
+    const VERSION = '0.12.7-$Id$';
 
     const LOGO = <<<'ASCII'
  _____              __    _

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.12.6-{build}
+version: 0.12.7-{build}
 
 environment:
     matrix:

diff --git a/ext/kernel/fcall.c b/ext/kernel/fcall.c
@@ -1,22 +1,13 @@
-
 /*
-  +------------------------------------------------------------------------+
-  | Zephir Language                                                        |
-  +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2017 Zephir Team (https://www.zephir-lang.com)      |
-  +------------------------------------------------------------------------+
-  | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
-  |                                                                        |
-  | If you did not receive a copy of the license and are unable to         |
-  | obtain it through the world-wide-web, please send an email             |
-  | to [email protected] so we can send you a copy immediately.      |
-  +------------------------------------------------------------------------+
-  | Authors: Andres Gutierrez <[email protected]>                     |
-  |          Eduar Carvajal <[email protected]>                        |
-  |          Vladimir Kolesnikov <[email protected]>              |
-  +------------------------------------------------------------------------+
-*/
+ * This file is part of the Zephir.
+ *
+ * (c) Zephir Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code. If you did not receive
+ * a copy of the license it is available through the world-wide-web at the
+ * following url: https://docs.zephir-lang.com/en/latest/license
+ */
 
 #include <php.h>
 #include "php_ext.h"

diff --git a/ext/kernel/fcall.h b/ext/kernel/fcall.h
@@ -1,22 +1,13 @@
-
 /*
-  +------------------------------------------------------------------------+
-  | Zephir Language                                                        |
-  +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
-  +------------------------------------------------------------------------+
-  | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
-  |                                                                        |
-  | If you did not receive a copy of the license and are unable to         |
-  | obtain it through the world-wide-web, please send an email             |
-  | to [email protected] so we can send you a copy immediately.      |
-  +------------------------------------------------------------------------+
-  | Authors: Andres Gutierrez <[email protected]>                     |
-  |          Eduar Carvajal <[email protected]>                        |
-  |          Vladimir Kolesnikov <[email protected]>              |
-  +------------------------------------------------------------------------+
-*/
+ * This file is part of the Zephir.
+ *
+ * (c) Zephir Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code. If you did not receive
+ * a copy of the license it is available through the world-wide-web at the
+ * following url: https://docs.zephir-lang.com/en/latest/license
+ */
 
 #ifndef ZEPHIR_KERNEL_FCALL_H
 #define ZEPHIR_KERNEL_FCALL_H

diff --git a/ext/kernel/memory.c b/ext/kernel/memory.c
@@ -1,22 +1,13 @@
-
 /*
-  +------------------------------------------------------------------------+
-  | Zephir Language                                                        |
-  +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
-  +------------------------------------------------------------------------+
-  | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
-  |                                                                        |
-  | If you did not receive a copy of the license and are unable to         |
-  | obtain it through the world-wide-web, please send an email             |
-  | to [email protected] so we can send you a copy immediately.      |
-  +------------------------------------------------------------------------+
-  | Authors: Andres Gutierrez <[email protected]>                     |
-  |          Eduar Carvajal <[email protected]>                        |
-  |          Vladimir Kolesnikov <[email protected]>              |
-  +------------------------------------------------------------------------+
-*/
+ * This file is part of the Zephir.
+ *
+ * (c) Zephir Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code. If you did not receive
+ * a copy of the license it is available through the world-wide-web at the
+ * following url: https://docs.zephir-lang.com/en/latest/license
+ */
 
 #include "php.h"
 #include "php_ext.h"

diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
@@ -1,22 +1,13 @@
-
 /*
-  +------------------------------------------------------------------------+
-  | Zephir Language                                                        |
-  +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
-  +------------------------------------------------------------------------+
-  | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
-  |                                                                        |
-  | If you did not receive a copy of the license and are unable to         |
-  | obtain it through the world-wide-web, please send an email             |
-  | to [email protected] so we can send you a copy immediately.      |
-  +------------------------------------------------------------------------+
-  | Authors: Andres Gutierrez <[email protected]>                     |
-  |          Eduar Carvajal <[email protected]>                        |
-  |          Vladimir Kolesnikov <[email protected]>              |
-  +------------------------------------------------------------------------+
-*/
+ * This file is part of the Zephir.
+ *
+ * (c) Zephir Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code. If you did not receive
+ * a copy of the license it is available through the world-wide-web at the
+ * following url: https://docs.zephir-lang.com/en/latest/license
+ */
 
 #ifndef ZEPHIR_KERNEL_MEMORY_H
 #define ZEPHIR_KERNEL_MEMORY_H

diff --git a/ext/kernel/object.h b/ext/kernel/object.h
@@ -1,22 +1,13 @@
-
 /*
-  +------------------------------------------------------------------------+
-  | Zephir Language                                                        |
-  +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
-  +------------------------------------------------------------------------+
-  | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
-  |                                                                        |
-  | If you did not receive a copy of the license and are unable to         |
-  | obtain it through the world-wide-web, please send an email             |
-  | to [email protected] so we can send you a copy immediately.      |
-  +------------------------------------------------------------------------+
-  | Authors: Andres Gutierrez <[email protected]>                     |
-  |          Eduar Carvajal <[email protected]>                        |
-  |          Vladimir Kolesnikov <[email protected]>              |
-  +------------------------------------------------------------------------+
-*/
+ * This file is part of the Zephir.
+ *
+ * (c) Zephir Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code. If you did not receive
+ * a copy of the license it is available through the world-wide-web at the
+ * following url: https://docs.zephir-lang.com/en/latest/license
+ */
 
 #ifndef ZEPHIR_KERNEL_OBJECT_H
 #define ZEPHIR_KERNEL_OBJECT_H

diff --git a/ext/kernel/string.c b/ext/kernel/string.c
@@ -39,11 +39,11 @@
 #include <ext/standard/html.h>
 #include <ext/date/php_date.h>
 
-#ifdef ZEPHIR_USE_PHP_PCRE
+#if defined ZEPHIR_USE_PHP_PCRE && ZEPHIR_USE_PHP_PCRE
 #include <ext/pcre/php_pcre.h>
 #endif
 
-#ifdef ZEPHIR_USE_PHP_JSON
+#if defined ZEPHIR_USE_PHP_JSON && ZEPHIR_USE_PHP_JSON
 #include <ext/json/php_json.h>
 #endif
 
@@ -402,17 +402,17 @@ static void zephir_append_printable_zval(smart_str *implstr, zval *tmp)
 
 void zephir_append_printable_array(smart_str *implstr, const zval *value)
 {
-
-	zval           *tmp;
-	zend_array     *arr;
-	unsigned int numelems, i = 0;
+	zend_array *arr;
+	unsigned int numelems;
 
 	arr = Z_ARRVAL_P(value);
 	numelems = zend_hash_num_elements(arr);
 
 	smart_str_appendc(implstr, '[');
 
 	if (numelems > 0) {
+		zval *tmp;
+		unsigned int i = 0;
 
 		ZEND_HASH_FOREACH_VAL(arr, tmp) {
 
@@ -1041,7 +1041,7 @@ void zephir_fast_str_replace(zval *return_value_ptr, zval *search, zval *replace
 	}
 }
 
-#ifdef ZEPHIR_USE_PHP_PCRE
+#if defined ZEPHIR_USE_PHP_PCRE && ZEPHIR_USE_PHP_PCRE
 
 /**
  * Execute preg-match without function lookup in the PHP userland
@@ -1150,7 +1150,7 @@ void zephir_preg_match(zval *return_value, zval *regex, zval *subject, zval *mat
 
 #endif /* ZEPHIR_USE_PHP_PCRE */
 
-#ifdef ZEPHIR_USE_PHP_JSON
+#if defined ZEPHIR_USE_PHP_JSON && ZEPHIR_USE_PHP_JSON
 
 int zephir_json_encode(zval *return_value, zval *v, int opts)
 {
@@ -1191,7 +1191,7 @@ int zephir_json_encode(zval *return_value, zval *v, int opts)
 	zval zopts;
 	zval *params[2];
 
-	ZEPHIR_INIT_VAR(&zopts);
+	ZEPHIR_NULL(&zopts);
 	ZVAL_LONG(&zopts, opts);
 
 	params[0] = v;
@@ -1205,7 +1205,7 @@ int zephir_json_decode(zval *return_value, zval *v, zend_bool assoc)
 	zval zassoc;
 	zval *params[2];
 
-	ZEPHIR_INIT_VAR(&zassoc);
+	ZEPHIR_NULL(&zassoc);
 	ZVAL_BOOL(&zassoc, assoc);
 
 	params[0] = v;
@@ -1222,10 +1222,9 @@ void zephir_md5(zval *return_value, zval *str)
 	unsigned char digest[16];
 	char hexdigest[33];
 	zval copy;
-	int use_copy = 0;
 
 	if (Z_TYPE_P(str) != IS_STRING) {
-		use_copy = zend_make_printable_zval(str, &copy);
+		int use_copy = zend_make_printable_zval(str, &copy);
 		if (use_copy) {
 			str = &copy;
 		}
@@ -1274,7 +1273,6 @@ void zephir_crc32(zval *return_value, zval *str)
 void zephir_ucfirst(zval *return_value, zval *s)
 {
 	zval copy;
-	char *c;
 	int use_copy = 0;
 
 	if (UNEXPECTED(Z_TYPE_P(s) != IS_STRING)) {
@@ -1286,8 +1284,8 @@ void zephir_ucfirst(zval *return_value, zval *s)
 
 	if (!Z_STRLEN_P(s)) {
 		ZVAL_EMPTY_STRING(return_value);
-	}
-	else {
+	} else {
+		char *c;
 		ZVAL_STRINGL(return_value, Z_STRVAL_P(s), Z_STRLEN_P(s));
 		c = Z_STRVAL_P(return_value);
 		*c = toupper((unsigned char)*c);
@@ -1407,7 +1405,7 @@ void zephir_string_to_hex(zval *return_value, zval *var)
 	res = zend_string_alloc(2*Z_STRLEN_P(var) + 1, 0);
 	s   = Z_STRVAL_P(var);
 	for (i=0; i<Z_STRLEN_P(var); ++i) {
-		sprintf(res->val + 2*i, "%hhX", s[i]);
+		sprintf(res->val + 2*i, "%hhX", (unsigned char) s[i]);
 	}
 
 	res->val[2*Z_STRLEN_P(var)] = 0;

diff --git a/ext/kernel/string.h b/ext/kernel/string.h
@@ -1,22 +1,13 @@
-
 /*
-  +------------------------------------------------------------------------+
-  | Zephir Language                                                        |
-  +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2017 Zephir Team (http://www.zephir-lang.com)       |
-  +------------------------------------------------------------------------+
-  | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
-  |                                                                        |
-  | If you did not receive a copy of the license and are unable to         |
-  | obtain it through the world-wide-web, please send an email             |
-  | to [email protected] so we can send you a copy immediately.      |
-  +------------------------------------------------------------------------+
-  | Authors: Andres Gutierrez <[email protected]>                     |
-  |          Eduar Carvajal <[email protected]>                        |
-  |          Vladimir Kolesnikov <[email protected]>              |
-  +------------------------------------------------------------------------+
-*/
+ * This file is part of the Zephir.
+ *
+ * (c) Zephir Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code. If you did not receive
+ * a copy of the license it is available through the world-wide-web at the
+ * following url: https://docs.zephir-lang.com/en/latest/license
+ */
 
 #ifndef ZEPHIR_KERNEL_STRING_H
 #define ZEPHIR_KERNEL_STRING_H

diff --git a/ext/php_test.h b/ext/php_test.h
@@ -14,7 +14,7 @@
 #define PHP_TEST_VERSION     "1.0.0"
 #define PHP_TEST_EXTNAME     "test"
 #define PHP_TEST_AUTHOR      "Zephir Team and contributors"
-#define PHP_TEST_ZEPVERSION  "0.12.6-$Id$"
+#define PHP_TEST_ZEPVERSION  "0.12.7-$Id$"
 #define PHP_TEST_DESCRIPTION "Description <b>test</b> for<br/>Test Extension."
 
 typedef struct _zephir_struct_db { 

diff --git a/kernels/ZendEngine3/fcall.c b/kernels/ZendEngine3/fcall.c
@@ -1,22 +1,13 @@
-
 /*
-  +------------------------------------------------------------------------+
-  | Zephir Language                                                        |
-  +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2017 Zephir Team (https://www.zephir-lang.com)      |
-  +------------------------------------------------------------------------+
-  | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
-  |                                                                        |
-  | If you did not receive a copy of the license and are unable to         |
-  | obtain it through the world-wide-web, please send an email             |
-  | to [email protected] so we can send you a copy immediately.      |
-  +------------------------------------------------------------------------+
-  | Authors: Andres Gutierrez <[email protected]>                     |
-  |          Eduar Carvajal <[email protected]>                        |
-  |          Vladimir Kolesnikov <[email protected]>              |
-  +------------------------------------------------------------------------+
-*/
+ * This file is part of the Zephir.
+ *
+ * (c) Zephir Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code. If you did not receive
+ * a copy of the license it is available through the world-wide-web at the
+ * following url: https://docs.zephir-lang.com/en/latest/license
+ */
 
 #include <php.h>
 #include "php_ext.h"