stupid errors

Author: withinboredom

Zend/zend.c

@@ -42,6 +42,7 @@
 #include "Optimizer/zend_optimizer.h"
 #include "php.h"
 #include "php_globals.h"
+#include "zend_namespaces.h"
 
 // FIXME: Breaks the declaration of the function below
 #undef zenderror
@@ -1348,6 +1349,8 @@ ZEND_API void zend_deactivate(void) /* {{{ */
 		shutdown_scanner();
 	} zend_end_try();
 
+	zend_destroy_namespaces();
+
 	/* shutdown_executor() takes care of its own bailout handling */
 	shutdown_executor();
 

Zend/zend_opcode.c

@@ -430,10 +430,6 @@ ZEND_API void destroy_zend_class(zval *zv)
 			if (ce->backed_enum_table) {
 				zend_hash_release(ce->backed_enum_table);
 			}
-			if (ce->required_scope) {
-				ce->required_scope->refcount--;
-				ce->required_scope = NULL;
-			}
 			break;
 		case ZEND_INTERNAL_CLASS:
 		case ZEND_NAMESPACE_CLASS:

main/main.c

@@ -66,8 +66,6 @@
 #include <sys/wait.h>
 #endif
 
-#include "zend_namespaces.h"
-
 #include "zend_compile.h"
 #include "zend_execute.h"
 #include "zend_highlight.h"
@@ -1958,7 +1956,6 @@ void php_request_shutdown(void *dummy)
 	} zend_end_try();
 
 	/* 9. Shutdown scanner/executor/compiler and restore ini entries */
-	zend_destroy_namespaces();
 	zend_deactivate();
 
 	/* 10. free request-bound globals */