diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-26 09:57:36 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-26 09:57:36 -0700 |
| commit | a3b0fa0d04cad5712f64e08463d0026f9890a37c (patch) | |
| tree | 1317a8a47c0e4bd1193c8fbf705d91ae75140f78 /ext/spl/tests | |
| parent | c175617b800536c08b593cf080f8120623cc009e (diff) | |
| parent | 0d7a6388663b76ebed6585ac92dfca5ef65fa7af (diff) | |
| download | php-git-a3b0fa0d04cad5712f64e08463d0026f9890a37c.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Adam Harvey (2) and others
# Via Adam Harvey (2) and others
* 'master' of https://git.php.net/repository/php-src:
Implement variadic function syntax
Added function opcache_compile_file() to load PHP scripts into cache without execution.
Fixed issue #135 (segfault in interned strings if initial memory is too low)
Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
Make message and format arguments const char * to avoid build warning about invalid cast.
Copy dba_*() keys before converting to string.
Diffstat (limited to 'ext/spl/tests')
| -rw-r--r-- | ext/spl/tests/bug51532.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/tests/bug51532.phpt b/ext/spl/tests/bug51532.phpt index 3a0722b2af..26eaa8f82f 100644 --- a/ext/spl/tests/bug51532.phpt +++ b/ext/spl/tests/bug51532.phpt @@ -4,7 +4,7 @@ SPL: Allow valid extension of SplFileObject::fscanf <?php class A extends SplFileObject { - public function fscanf($format) { + public function fscanf($format, &...$vars) { } } |