Merge pull request #2389 from zephir-lang/development

0.16.3
zephir-lang · Sep 17, 2022 · 5099f34 · 5099f34
2 parents 3e961ab + c3f9587
commit 5099f34
Show file tree

Hide file tree

Showing 13 changed files with 182 additions and 466 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ## [Unreleased]
 
+## [0.16.3] - 2022-09-17
+### Fixed
+- Fixed segmentation fault on `mixed` return type and PHP 7.4 [#2387](https://github.com/zephir-lang/zephir/issues/2387)
+
 ## [0.16.2] - 2022-08-22
 ### Added
 - Added support for `object` return type [#2374](https://github.com/zephir-lang/zephir/issues/2374)

diff --git a/Library/ArgInfoDefinition.php b/Library/ArgInfoDefinition.php
@@ -220,12 +220,10 @@ private function richRenderStart(): void
             $this->codePrinter->output('#else');
             $this->codePrinter->output(
                 sprintf(
-                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, %s, %d)',
+                    'ZEND_BEGIN_ARG_INFO_EX(%s, 0, %d, %d)',
                     $this->name,
                     (int) $this->returnByRef,
                     $this->functionLike->getNumberOfRequiredParameters(),
-                    $this->getReturnType(),
-                    (int) $this->functionLike->areReturnTypesNullCompatible()
                 )
             );
             $this->codePrinter->output('#endif');

diff --git a/Library/Zephir.php b/Library/Zephir.php
@@ -15,7 +15,7 @@
 
 final class Zephir
 {
-    public const VERSION = '0.16.2-$Id$';
+    public const VERSION = '0.16.3-$Id$';
 
     public const LOGO = <<<'ASCII'
  _____              __    _

diff --git a/composer.lock b/composer.lock
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.16.2-$Id$"
+#define PHP_STUB_ZEPVERSION  "0.16.3-$Id$"
 #define PHP_STUB_DESCRIPTION "Description <b>test</b> for<br/>Test Extension."
 
 typedef struct _zephir_struct_db { 

diff --git a/ext/stub.c b/ext/stub.c
@@ -586,7 +586,7 @@ static PHP_MINFO_FUNCTION(stub)
 		php_info_print_table_start();
 	php_info_print_table_header(2, "Test Extension support", "Value");
 	php_info_print_table_row(2, "Lifecycle hooks", "PHP provides several lifecycle events, which extensions can use to perform common initialization or shutdown tasks.");
-	php_info_print_table_row(2, "Static Analysis", "Test extensions&#039; compiler provides static analysis of the compiled code.");
+	php_info_print_table_row(2, "Static Analysis", "Test extensions' compiler provides static analysis of the compiled code.");
 	php_info_print_table_end();
 	php_info_print_table_start();
 	php_info_print_table_header(2, "Test variable", "Value");

diff --git a/ext/stub/arrayaccessarr.zep.h b/ext/stub/arrayaccessarr.zep.h
diff --git a/ext/stub/arrayaccessobj.zep.h b/ext/stub/arrayaccessobj.zep.h
diff --git a/ext/stub/arrayiterator.zep.h b/ext/stub/arrayiterator.zep.h
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
diff --git a/ext/stub/oo/oonativeimplements.zep.h b/ext/stub/oo/oonativeimplements.zep.h
diff --git a/ext/stub/types/mixedtype.zep.h b/ext/stub/types/mixedtype.zep.h
diff --git a/zephir b/zephir
@@ -99,15 +99,13 @@ $consoleStdErrorHandler->setFormatter($formatter);
 $consoleStdOutHandler = new StreamHandler('php://stdout', Logger::INFO, false);
 $consoleStdOutHandler->setFormatter($formatter);
 
-$handlers = [
-    $consoleStdErrorHandler,
-    $consoleStdOutHandler,
-];
-
 $disk = new HardDisk(getcwd().'/.zephir');
 
 $parser = new Parser();
-$logger = new Logger('zephir', $handlers);
+$logger = new Logger('zephir', [
+    $consoleStdErrorHandler,
+    $consoleStdOutHandler,
+]);
 $compilerFactory = new Compiler\CompilerFileFactory($config, $disk, $logger);
 $backend = (new BackendFactory($config, $rootPath.'/kernels', $rootPath.'/templates'))
     ->createBackend();