Merge remote-tracking branch 'upstream/master'

1 files changed, 31 insertions, 12 deletions

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index d62069c..9a5ac90 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -22,10 +22,13 @@ ZEND_DLEXPORT int sp_zend_startup(zend_extension *extension) {
 // LCOV_EXCL_END
 
 static inline void sp_op_array_handler(zend_op_array *op) {
-  if (NULL == op->filename) {
+  // We need a filename, and strict mode not already enabled on this op
+  if (NULL == op->filename || op->fn_flags & ZEND_ACC_STRICT_TYPES) {
     return;
   } else {
-    op->fn_flags |= ZEND_ACC_STRICT_TYPES;
+    if (true == SNUFFLEUPAGUS_G(config).config_global_strict->enable) {
+      op->fn_flags |= ZEND_ACC_STRICT_TYPES;
+    }
   }
 }
 
@@ -59,7 +62,7 @@ ZEND_DLEXPORT zend_extension zend_extension_entry = {
     NULL,                 /* activate_func_t */
     NULL,                 /* deactivate_func_t */
     NULL,                 /* message_handler_func_t */
-    sp_op_array_handler,  // zend_global_strict, /* op_array_handler_func_t */
+    sp_op_array_handler,  /* op_array_handler_func_t */
     NULL,                 /* statement_handler_func_t */
     NULL,                 /* fcall_begin_handler_func_t */
     NULL,                 /* fcall_end_handler_func_t */
@@ -68,6 +71,7 @@ ZEND_DLEXPORT zend_extension zend_extension_entry = {
     STANDARD_ZEND_EXTENSION_PROPERTIES};
 
 PHP_GINIT_FUNCTION(snuffleupagus) {
+  snuffleupagus_globals->is_config_valid = SP_CONFIG_NONE;
   snuffleupagus_globals->in_eval = 0;
 
 #define SP_INIT_HT(F) snuffleupagus_globals->F = \
@@ -186,8 +190,12 @@ PHP_RINIT_FUNCTION(snuffleupagus) {
   ZEND_TSRMLS_CACHE_UPDATE();
 #endif
 
-  if (!SNUFFLEUPAGUS_G(allow_broken_configuration) && !SNUFFLEUPAGUS_G(is_config_valid)) {
-    sp_log_err("config", "Invalid configuration file");
+  if (!SNUFFLEUPAGUS_G(allow_broken_configuration)) {
+    if (SNUFFLEUPAGUS_G(is_config_valid) == SP_CONFIG_INVALID ) {
+      sp_log_err("config", "Invalid configuration file");
+    } else if (SNUFFLEUPAGUS_G(is_config_valid) == SP_CONFIG_NONE) {
+      sp_log_warn("config", "No configuration specificed via sp.configuration_file");
+    }
   }
 
   // We need to disable wrappers loaded by extensions loaded after SNUFFLEUPAGUS.
@@ -209,12 +217,23 @@ PHP_RINIT_FUNCTION(snuffleupagus) {
 PHP_RSHUTDOWN_FUNCTION(snuffleupagus) { return SUCCESS; }
 
 PHP_MINFO_FUNCTION(snuffleupagus) {
+  const char *valid_config;
+  switch(SNUFFLEUPAGUS_G(is_config_valid)) {
+    case SP_CONFIG_VALID:
+      valid_config = "yes";
+      break;
+    case SP_CONFIG_INVALID:
+      valid_config = "invalid";
+      break;
+    case SP_CONFIG_NONE:
+    default:
+      valid_config = "no";
+  }
   php_info_print_table_start();
-  php_info_print_table_row(2, "snuffleupagus support", "enabled");
+  php_info_print_table_row(2, "snuffleupagus support",
+      SNUFFLEUPAGUS_G(is_config_valid)?"enabled":"disabled");
   php_info_print_table_row(2, "Version", PHP_SNUFFLEUPAGUS_VERSION);
-  php_info_print_table_row(
-      2, "Valid config",
-      (SNUFFLEUPAGUS_G(is_config_valid) == true) ? "yes" : "no");
+  php_info_print_table_row( 2, "Valid config", valid_config);
   php_info_print_table_end();
   DISPLAY_INI_ENTRIES();
 }
@@ -234,14 +253,14 @@ static PHP_INI_MH(OnUpdateConfiguration) {
     int ret = glob(config_file, GLOB_NOCHECK, NULL, &globbuf);
 
     if (ret != 0) {
-      SNUFFLEUPAGUS_G(is_config_valid) = false;
+      SNUFFLEUPAGUS_G(is_config_valid) = SP_CONFIG_INVALID;
       globfree(&globbuf);
       return FAILURE;
     }
 
     for (size_t i = 0; globbuf.gl_pathv[i]; i++) {
       if (sp_parse_config(globbuf.gl_pathv[i]) != SUCCESS) {
-        SNUFFLEUPAGUS_G(is_config_valid) = false;
+        SNUFFLEUPAGUS_G(is_config_valid) = SP_CONFIG_INVALID;
         globfree(&globbuf);
         return FAILURE;
       }
@@ -249,7 +268,7 @@ static PHP_INI_MH(OnUpdateConfiguration) {
     globfree(&globbuf);
   }
 
-  SNUFFLEUPAGUS_G(is_config_valid) = true;
+  SNUFFLEUPAGUS_G(is_config_valid) = SP_CONFIG_VALID;
 
   if ((SNUFFLEUPAGUS_G(config).config_sloppy->enable)) {
     hook_sloppy();