Skip to content

Commit 58a03e8

Browse files
committed
Merge pull request #46 from BitOne/php7
Simplifies code and add summary analyzer
2 parents fecfcae + 6e8e70b commit 58a03e8

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ before_script:
1919
- phpenv config-rm xdebug.ini
2020

2121
script:
22-
- cd php$(echo $TRAVIS_PHP_VERSION | cut -b 1)/
22+
- cd extension/php$(echo $TRAVIS_PHP_VERSION | cut -b 1)/
2323
- phpize
24-
- configure
24+
- ./configure
2525
- make
26-
- make test
27-
28-
after_script:
29-
- ./.travis.scripts/show-errors.sh
26+
- REPORT_EXIT_STATUS=1 make test
27+
- cd ../../analyzer
28+
- composer install
29+
- vendor/bin/phpspec run

extension/php5/meminfo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ PHP_FUNCTION(meminfo_info_dump)
8484
// Switch the active frame to the current browsed one and rebuild the symbol table
8585
// to get it right
8686
EG(current_execute_data) = exec_frame;
87-
zend_rebuild_symbol_table();
87+
zend_rebuild_symbol_table(TSRMLS_C);
8888
symbol_table = EG(active_symbol_table);
8989

9090
// 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)
9999
}
100100
}
101101
EG(current_execute_data) = init_exec_frame;
102-
zend_rebuild_symbol_table();
102+
zend_rebuild_symbol_table(TSRMLS_C);
103103

104104
global_symbol_table = &EG(symbol_table);
105105

0 commit comments

Comments
 (0)