Merge pull request #2236 from zephir-lang/development

0.13.4
zephir-lang · Apr 26, 2021 · 1218434 · 1218434
2 parents f18f285 + 8d3141c
commit 1218434
Show file tree

Hide file tree

Showing 27 changed files with 289 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org).
 ## [Unreleased]
 
 
+## [0.13.4] - 2021-04-26
+### Fixed
+- Fixed cast string from null [#2232](https://github.com/zephir-lang/zephir/issues/2232)
+- Fixed strict nullable string type when `null` is passed [#2234](https://github.com/zephir-lang/zephir/issues/2234)
+
+
 ## [0.13.3] - 2021-04-25
 ### Fixed
 - Fixed nullable array [#1094](https://github.com/zephir-lang/zephir/issues/1094)
@@ -465,7 +471,8 @@ and this project adheres to [Semantic Versioning](http://semver.org).
 - Fixed casting resource to int (only ZendEngine 3)
   [#1524](https://github.com/zephir-lang/zephir/issues/1524)
 
-[Unreleased]: https://github.com/zephir-lang/zephir/compare/0.13.3...HEAD
+[Unreleased]: https://github.com/zephir-lang/zephir/compare/0.13.4...HEAD
+[0.13.4]: https://github.com/zephir-lang/zephir/compare/0.13.3...0.13.4
 [0.13.3]: https://github.com/zephir-lang/zephir/compare/0.13.2...0.13.3
 [0.13.2]: https://github.com/zephir-lang/zephir/compare/0.13.1...0.13.2
 [0.13.1]: https://github.com/zephir-lang/zephir/compare/0.13.0...0.13.1

diff --git a/Library/Backends/ZendEngine2/Backend.php b/Library/Backends/ZendEngine2/Backend.php
@@ -1036,7 +1036,6 @@ public function checkStrictType($type, $var, CompilationContext $context)
                 $codePrinter->output('} else {');
                 $codePrinter->increaseLevel();
                 $this->initVar($inputParamVariable, $context);
-                $codePrinter->output('ZVAL_EMPTY_STRING('.$inputParamCode.');');
                 $codePrinter->decreaseLevel();
                 $codePrinter->output('}');
                 break;

diff --git a/Library/Operators/Other/CastOperator.php b/Library/Operators/Other/CastOperator.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Other;
 
 use Zephir\CompilationContext;
@@ -22,7 +24,7 @@
 use Zephir\Types;
 
 /**
- * Cast.
+ * Cast operator
  *
  * Converts a value into another of a different type
  */
@@ -527,7 +529,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                 $resolvedCode = $compilationContext->backend->getVariableCode($resolvedVariable);
 
                                 $compilationContext->codePrinter->output(
-                                    sprintf('zephir_get_strval(%s, %s);', $symbol, $resolvedCode)
+                                    sprintf('zephir_cast_to_string(%s, %s);', $symbol, $resolvedCode)
                                 );
 
                                 if ($symbolVariable->isTemporal()) {

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

diff --git a/ext/kernel/operators.h b/ext/kernel/operators.h
@@ -194,6 +194,27 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 		}  \
 	}
 
+/**
+ * This is previous version of zephir_get_strval()
+ *
+ * TODO: Find more native solution to cast a string
+ */
+#define zephir_cast_to_string(left, right) \
+    { \
+        int use_copy_right; \
+        zval right_tmp; \
+        if (Z_TYPE_P(right) == IS_STRING) { \
+            ZEPHIR_CPY_WRT(left, right); \
+        } else { \
+            use_copy_right = zephir_make_printable_zval(right, &right_tmp); \
+            if (use_copy_right) { \
+                ZEPHIR_INIT_NVAR(left); \
+                ZVAL_STRINGL(left, Z_STRVAL(right_tmp), Z_STRLEN(right_tmp)); \
+                zval_ptr_dtor(&right_tmp); \
+            } \
+        } \
+    }
+
 /**
  * TODO: Re-visit IS_NULL check, when ZEND_PARSE_PARAMETERS_* will be in better condition in Zephir
  */

diff --git a/ext/php_stub.h b/ext/php_stub.h
@@ -14,7 +14,7 @@
 #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.13.3-$Id$"
+#define PHP_STUB_ZEPVERSION  "0.13.4-$Id$"
 #define PHP_STUB_DESCRIPTION "Description <b>test</b> for<br/>Test Extension."
 
 typedef struct _zephir_struct_db { 

diff --git a/ext/stub/arrayaccesstest.zep.c b/ext/stub/arrayaccesstest.zep.c
diff --git a/ext/stub/cast.zep.c b/ext/stub/cast.zep.c
diff --git a/ext/stub/cast.zep.h b/ext/stub/cast.zep.h
diff --git a/ext/stub/compare.zep.c b/ext/stub/compare.zep.c
diff --git a/ext/stub/exception.zep.c b/ext/stub/exception.zep.c
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
diff --git a/ext/stub/oo/dynamicprop.zep.c b/ext/stub/oo/dynamicprop.zep.c
diff --git a/ext/stub/oo/oodestruct.zep.c b/ext/stub/oo/oodestruct.zep.c
diff --git a/ext/stub/oo/ooparams.zep.c b/ext/stub/oo/ooparams.zep.c
diff --git a/ext/stub/properties/propertyarray.zep.c b/ext/stub/properties/propertyarray.zep.c
diff --git a/ext/stub/requires.zep.c b/ext/stub/requires.zep.c