Improved ZEPHIR_REGISTER_CLASS macro

zephir-lang · Oct 22, 2018 · d38924e · d38924e
1 parent 357601a
commit d38924e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/kernels/ZendEngine3/main.h b/kernels/ZendEngine3/main.h
@@ -24,6 +24,7 @@
 #include <ext/spl/spl_exceptions.h>
 #include <ext/spl/spl_iterators.h>
 #include <Zend/zend_string.h>
+#include <Zend/zend.h>
 
 extern zend_string* i_parent;
 extern zend_string* i_static;
@@ -59,14 +60,20 @@ extern zend_string* i_self;
 #include <Zend/zend_constants.h>
 #include "kernel/exception.h"
 
-/** class/interface registering */
-#define ZEPHIR_REGISTER_CLASS(ns, class_name, lower_ns, name, methods, flags) \
-	{ \
-		zend_class_entry ce; \
-		memset(&ce, 0, sizeof(zend_class_entry)); \
-		INIT_NS_CLASS_ENTRY(ce, #ns, #class_name, methods); \
-		lower_ns## _ ##name## _ce = zend_register_internal_class(&ce); \
-		lower_ns## _ ##name## _ce->ce_flags |= flags;  \
+/* class/interface registering */
+#define ZEPHIR_REGISTER_CLASS(ns, class_name, lower_ns, name, methods, flags)		\
+	{																				\
+		zend_class_entry ce;														\
+		memset(&ce, 0, sizeof(zend_class_entry));									\
+		INIT_NS_CLASS_ENTRY(ce, #ns, #class_name, methods);							\
+		lower_ns## _ ##name## _ce = zend_register_internal_class(&ce);				\
+		if (UNEXPECTED(!lower_ns## _ ##name## _ce)) {								\
+			const char *_n = (#ns);													\
+			const char *_c = (#class_name);											\
+			zend_error(E_ERROR, "%s\\%s: class registration has failed.", _n, _c);	\
+			return FAILURE;															\
+		}																			\
+		lower_ns## _ ##name## _ce->ce_flags |= flags;								\
 	}
 
 #define ZEPHIR_REGISTER_CLASS_EX(ns, class_name, lower_ns, lcname, parent_ce, methods, flags) \

diff --git a/unit-tests/Zephir/Test/TypeHintsTest.php b/unit-tests/Zephir/Test/TypeHintsTest.php
@@ -67,6 +67,7 @@ protected function generate($backend)
 
         try {
             $config = new Config();
+            $config->set('silent', true);
             $logger = new Logger($config);
             $backend = new $backend($config);
             $parser = new ParserManager(new Parser(), $logger);