Merge pull request #46 from BitOne/php7

Simplifies code and add summary analyzer

Author: BitOne

.travis.yml

@@ -19,11 +19,12 @@ before_script:
   - phpenv config-rm xdebug.ini
 
 script:
-  - cd php$(echo $TRAVIS_PHP_VERSION | cut -b 1)/
+  - cd extension/php$(echo $TRAVIS_PHP_VERSION | cut -b 1)/
+  - php-config
   - phpize
-  - configure
+  - ./configure --disable-maintainer-zts
   - make
-  - make test
-
-after_script:
-  - ./.travis.scripts/show-errors.sh
+  - REPORT_EXIT_STATUS=1 make test
+  - cd ../../analyzer
+  - composer install
+  - vendor/bin/phpspec run

extension/php5/meminfo.c

@@ -84,7 +84,7 @@ PHP_FUNCTION(meminfo_info_dump)
         // Switch the active frame to the current browsed one and rebuild the symbol table
         // to get it right
         EG(current_execute_data) = exec_frame;
-        zend_rebuild_symbol_table();
+        zend_rebuild_symbol_table(TSRMLS_C);
         symbol_table = EG(active_symbol_table);
 
         // Once we have the symbol table, switch to the prev frame to get the right frame name
@@ -99,7 +99,7 @@ PHP_FUNCTION(meminfo_info_dump)
         }
     }
     EG(current_execute_data) = init_exec_frame;
-    zend_rebuild_symbol_table();
+    zend_rebuild_symbol_table(TSRMLS_C);
 
     global_symbol_table = &EG(symbol_table);
 
@@ -444,11 +444,11 @@ char * meminfo_info_dump_header(char * header, int header_len)
     size_t peak_memory_usage;
     size_t peak_memory_usage_real;
 
-    memory_usage = zend_memory_usage(0);
-    memory_usage_real = zend_memory_usage(1);
+    memory_usage = zend_memory_usage(0 TSRMLS_CC);
+    memory_usage_real = zend_memory_usage(1 TSRMLS_CC);
 
-    peak_memory_usage = zend_memory_peak_usage(0);
-    peak_memory_usage_real = zend_memory_peak_usage(1);
+    peak_memory_usage = zend_memory_peak_usage(0 TSRMLS_CC);
+    peak_memory_usage_real = zend_memory_peak_usage(1 TSRMLS_CC);
 
     snprintf(
         header,

extension/php5/php_meminfo.h

@@ -9,6 +9,8 @@
 #define MEMINFO_COPYRIGHT  "Copyright (c) 2010-2017 by Benoit Jacquemont"
 #define MEMINFO_COPYRIGHT_SHORT "Copyright (c) 2011-2017"
 
+extern zend_module_entry meminfo_entry;
+
 PHP_FUNCTION(meminfo_info_dump);
 
 const char * meminfo_get_classname(zend_object_handle handle);
@@ -25,6 +27,4 @@ void meminfo_build_frame_label(char * frame_label, int frame_label_len, zend_exe
 char * meminfo_escape_for_json(const char *s);
 char * meminfo_info_dump_header(char * header, int header_len);
 
-extern zend_module_entry meminfo_entry;
-
 #endif