diff options
52 files changed, 67 insertions, 67 deletions
diff --git a/Zend/tests/bug35470.phpt b/Zend/tests/bug35470.phpt index 5a854552bb..01d045744a 100644 --- a/Zend/tests/bug35470.phpt +++ b/Zend/tests/bug35470.phpt @@ -5,7 +5,7 @@ Bug #35470 (Assigning global using variable name from array doesn't function) $x = array("test", "55"); global ${$x[0]}; ${$x[0]} = $x[1]; -echo "Test: $test\n";; +echo "Test: $test\n"; ?> --EXPECT-- Test: 55 diff --git a/Zend/tests/bug49893.phpt b/Zend/tests/bug49893.phpt index b340f7bdfd..addf447073 100644 --- a/Zend/tests/bug49893.phpt +++ b/Zend/tests/bug49893.phpt @@ -20,7 +20,7 @@ class B { try { $b = new B(); } catch(Exception $e) { - echo $e->getMessage() . "\n";; + echo $e->getMessage() . "\n"; } ?> --EXPECT-- diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 678c852e8b..70613b2b96 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1880,7 +1880,7 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap) if (free_counter == bin_elements[i]) { has_free_pages = 1; } - chunk->map[page_num] = ZEND_MM_SRUN_EX(i, free_counter);; + chunk->map[page_num] = ZEND_MM_SRUN_EX(i, free_counter); p = p->next_free_slot; } @@ -1907,7 +1907,7 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap) ZEND_ASSERT(ZEND_MM_SRUN_BIN_NUM(info) == i); if (ZEND_MM_SRUN_FREE_COUNTER(info) == bin_elements[i]) { /* remove from cache */ - p = p->next_free_slot;; + p = p->next_free_slot; *q = p; } else { q = &p->next_free_slot; diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index ae0dd8f972..302a7828eb 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1667,7 +1667,7 @@ ZEND_API int zend_set_local_var(zend_string *name, zval *value, int force) /* {{ if (force) { zend_array *symbol_table = zend_rebuild_symbol_table(); if (symbol_table) { - return zend_hash_update(symbol_table, name, value) ? SUCCESS : FAILURE;; + return zend_hash_update(symbol_table, name, value) ? SUCCESS : FAILURE; } } } else { @@ -1709,7 +1709,7 @@ ZEND_API int zend_set_local_var_str(const char *name, size_t len, zval *value, i if (force) { zend_array *symbol_table = zend_rebuild_symbol_table(); if (symbol_table) { - return zend_hash_str_update(symbol_table, name, len, value) ? SUCCESS : FAILURE;; + return zend_hash_str_update(symbol_table, name, len, value) ? SUCCESS : FAILURE; } } } else { diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index 3eebad0ef1..d28398315d 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -302,7 +302,7 @@ static union _zend_function *com_method_get(zend_object **object_ptr, zend_strin f.arg_info = ecalloc(bindptr.lpfuncdesc->cParams, sizeof(zend_arg_info)); for (i = 0; i < bindptr.lpfuncdesc->cParams; i++) { - f.arg_info[i].type = ZEND_TYPE_ENCODE(0,1);; + f.arg_info[i].type = ZEND_TYPE_ENCODE(0,1); if (bindptr.lpfuncdesc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FOUT) { f.arg_info[i].pass_by_reference = ZEND_SEND_BY_REF; } diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 3684222f93..0d1152b987 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2508,7 +2508,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ zval_ptr_dtor(&ch->handlers->write_header->stream); ch->handlers->write_header->fp = fp; ch->handlers->write_header->method = PHP_CURL_FILE; - ZVAL_COPY(&ch->handlers->write_header->stream, zvalue);; + ZVAL_COPY(&ch->handlers->write_header->stream, zvalue); } else { php_error_docref(NULL, E_WARNING, "the provided file handle is not writable"); return FAILURE; diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 1e981ffcd2..ab92022340 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3009,7 +3009,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP { int a; char *decode; - size_t len;; + size_t len; *pszEncoding = NULL; /* Copy the comment */ diff --git a/ext/imap/tests/imap_alerts_error.phpt b/ext/imap/tests/imap_alerts_error.phpt index ab13ec4632..ee13b13503 100644 --- a/ext/imap/tests/imap_alerts_error.phpt +++ b/ext/imap/tests/imap_alerts_error.phpt @@ -16,7 +16,7 @@ echo "*** Testing imap_alerts() : error conditions ***\n"; // One argument echo "\n-- Testing imap_alerts() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( imap_alerts($extra_arg) ); ?> diff --git a/ext/intl/tests/rbbiter_getBinaryRules_basic.phpt b/ext/intl/tests/rbbiter_getBinaryRules_basic.phpt index dce0714d4d..7d77057123 100644 --- a/ext/intl/tests/rbbiter_getBinaryRules_basic.phpt +++ b/ext/intl/tests/rbbiter_getBinaryRules_basic.phpt @@ -22,7 +22,7 @@ $rules = <<<RULES !!safe_reverse; RULES; $rbbi = new IntlRuleBasedBreakIterator($rules); -$rbbi->setText('sdfkjsdf88á.... ,;');; +$rbbi->setText('sdfkjsdf88á.... ,;'); $br = $rbbi->getBinaryRules(); diff --git a/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt b/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt index a56f6bc488..4a654508cc 100644 --- a/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt +++ b/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt @@ -25,7 +25,7 @@ $rules = <<<RULES !!safe_reverse; RULES; $rbbi = new IntlRuleBasedBreakIterator($rules); -$rbbi->setText('sdfkjsdf88á.... ,;');; +$rbbi->setText('sdfkjsdf88á.... ,;'); do { var_dump($rbbi->current(), $rbbi->getRuleStatusVec()); @@ -56,4 +56,4 @@ array(1) { [0]=> int(4) } -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c index 8663057fd2..e31bc19817 100644 --- a/ext/mysqli/mysqli_exception.c +++ b/ext/mysqli/mysqli_exception.c @@ -44,7 +44,7 @@ void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, . va_start(arg, format); vspprintf(&message, 0, format, arg); - va_end(arg);; + va_end(arg); if (!(MyG(report_mode) & MYSQLI_REPORT_STRICT)) { php_error_docref(NULL, E_WARNING, "(%s/%d): %s", sqlstate, errorno, message); diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt index 59754bc278..75c4b02a29 100644 --- a/ext/mysqli/tests/065.phpt +++ b/ext/mysqli/tests/065.phpt @@ -41,7 +41,7 @@ if (!function_exists('mysqli_set_charset')) { printf("[005] Expecting 2/int got %s/%s\n", gettype($tmp), $tmp); if ('gbk' !== ($tmp = $mysql->character_set_name())) - printf("[005] Expecting gbk/string got %s/%s\n", gettype($tmp), $tmp);; + printf("[005] Expecting gbk/string got %s/%s\n", gettype($tmp), $tmp); } } $mysql->close(); diff --git a/ext/mysqli/tests/mysqli_debug.phpt b/ext/mysqli/tests/mysqli_debug.phpt index 2b754eac36..aa455d7f6e 100644 --- a/ext/mysqli/tests/mysqli_debug.phpt +++ b/ext/mysqli/tests/mysqli_debug.phpt @@ -17,7 +17,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED) ?> --FILE-- <?php - require_once('connect.inc');; + require_once('connect.inc'); if (NULL !== ($tmp = @mysqli_debug())) printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt index fbb0d0a84e..68e600772b 100644 --- a/ext/mysqli/tests/mysqli_debug_append.phpt +++ b/ext/mysqli/tests/mysqli_debug_append.phpt @@ -20,7 +20,7 @@ if (!$IS_MYSQLND) ?> --FILE-- <?php - require_once('connect.inc');; + require_once('connect.inc'); if (true !== ($tmp = mysqli_debug(sprintf('d:t:O,%s/mysqli_debug_phpt.trace', sys_get_temp_dir())))) printf("[001] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt index 1de2eebb2e..b5ba9a5a05 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt @@ -20,7 +20,7 @@ if (!$IS_MYSQLND) ?> --FILE-- <?php - require_once('connect.inc');; + require_once('connect.inc'); require_once('table.inc'); function try_control_string($link, $control_string, $trace_file, $offset) { diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt index 257926bae9..2886694440 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt @@ -21,7 +21,7 @@ if (!$IS_MYSQLND) ?> --FILE-- <?php - require_once('connect.inc');; + require_once('connect.inc'); require_once('table.inc'); function try_control_string($link, $control_string, $trace_file, $offset) { @@ -125,4 +125,4 @@ if (!$IS_MYSQLND) require_once("clean_table.inc"); ?> --EXPECTF-- -done!
\ No newline at end of file +done! diff --git a/ext/oci8/tests/coll_019.phpt b/ext/oci8/tests/coll_019.phpt index 371c802ede..e0c896dce1 100644 --- a/ext/oci8/tests/coll_019.phpt +++ b/ext/oci8/tests/coll_019.phpt @@ -13,7 +13,7 @@ require(dirname(__FILE__).'/skipif.inc'); require dirname(__FILE__)."/connect.inc"; -$ora_sql = "DROP TYPE ".$type_name;; +$ora_sql = "DROP TYPE ".$type_name; $statement = oci_parse($c,$ora_sql); @oci_execute($statement); diff --git a/ext/oci8/tests/lob_040.phpt b/ext/oci8/tests/lob_040.phpt index 0a29dc1b9e..0d60054b22 100644 --- a/ext/oci8/tests/lob_040.phpt +++ b/ext/oci8/tests/lob_040.phpt @@ -29,9 +29,9 @@ for ($i = 0; $i < NUMLOBS; $i++) { } for ($i = 0; $i < NUMLOBS; $i++) { - echo "Row $i Size: " . $row[$i][0]->size() . "\n";; + echo "Row $i Size: " . $row[$i][0]->size() . "\n"; echo "Pos 1: " . $row[$i][0]->tell() . "\n"; - echo "Data: " . $row[$i][0]->read(5) . "\n";; + echo "Data: " . $row[$i][0]->read(5) . "\n"; echo "Pos 2: " . $row[$i][0]->tell() . "\n"; echo "Data: " . $row[$i][0]->read(12) . "\n"; } diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 7e375e8289..32db2ca9e9 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -596,7 +596,7 @@ static void accel_copy_permanent_strings(zend_new_interned_string_func_t new_int ZEND_HASH_FOREACH_BUCKET(CG(auto_globals), p) { zend_auto_global *auto_global; - auto_global = (zend_auto_global*)Z_PTR(p->val);; + auto_global = (zend_auto_global*)Z_PTR(p->val); zend_string_addref(auto_global->name); auto_global->name = new_interned_string(auto_global->name); diff --git a/ext/opcache/zend_accelerator_debug.h b/ext/opcache/zend_accelerator_debug.h index 6445254232..01598deefd 100644 --- a/ext/opcache/zend_accelerator_debug.h +++ b/ext/opcache/zend_accelerator_debug.h @@ -28,6 +28,6 @@ #define ACCEL_LOG_INFO 3 #define ACCEL_LOG_DEBUG 4 -void zend_accel_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);; +void zend_accel_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); #endif /* _ZEND_ACCELERATOR_DEBUG_H */ diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c index 738c6285d2..4f00574965 100644 --- a/ext/opcache/zend_shared_alloc.c +++ b/ext/opcache/zend_shared_alloc.c @@ -228,14 +228,14 @@ int zend_shared_alloc_startup(size_t requested_size) p_tmp_shared_globals = (zend_smm_shared_globals *) zend_shared_alloc(sizeof(zend_smm_shared_globals)); if (!p_tmp_shared_globals) { zend_accel_error(ACCEL_LOG_FATAL, "Insufficient shared memory!"); - return ALLOC_FAILURE;; + return ALLOC_FAILURE; } memset(p_tmp_shared_globals, 0, sizeof(zend_smm_shared_globals)); tmp_shared_segments = zend_shared_alloc(shared_segments_array_size + ZSMMG(shared_segments_count) * sizeof(void *)); if (!tmp_shared_segments) { zend_accel_error(ACCEL_LOG_FATAL, "Insufficient shared memory!"); - return ALLOC_FAILURE;; + return ALLOC_FAILURE; } copy_shared_segments(tmp_shared_segments, ZSMMG(shared_segments)[0], ZSMMG(shared_segments_count), S_H(segment_type_size)()); @@ -249,7 +249,7 @@ int zend_shared_alloc_startup(size_t requested_size) ZSMMG(shared_memory_state).positions = (int *)zend_shared_alloc(sizeof(int) * ZSMMG(shared_segments_count)); if (!ZSMMG(shared_memory_state).positions) { zend_accel_error(ACCEL_LOG_FATAL, "Insufficient shared memory!"); - return ALLOC_FAILURE;; + return ALLOC_FAILURE; } ZCG(locked) = 0; diff --git a/ext/pcre/tests/split2.phpt b/ext/pcre/tests/split2.phpt index ccbb7242fd..b0411e6df2 100644 --- a/ext/pcre/tests/split2.phpt +++ b/ext/pcre/tests/split2.phpt @@ -8,7 +8,7 @@ pcre.jit=0 var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_DELIM_CAPTURE)); var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_OFFSET_CAPTURE)); var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE)); -var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE));; +var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE)); var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE)); var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE)); diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index c238ea0fb0..a826240c76 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -858,7 +858,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_ case PDO_FETCH_NAMED: if (!return_all) { ZVAL_NEW_ARR(return_value); - zend_hash_init(Z_ARRVAL_P(return_value), stmt->column_count, NULL, ZVAL_PTR_DTOR, 0);; + zend_hash_init(Z_ARRVAL_P(return_value), stmt->column_count, NULL, ZVAL_PTR_DTOR, 0); } else { array_init(return_value); } diff --git a/ext/phar/tests/011.phpt b/ext/phar/tests/011.phpt index 4a1f0dd42c..83bae148e0 100644 --- a/ext/phar/tests/011.phpt +++ b/ext/phar/tests/011.phpt @@ -15,7 +15,7 @@ __HALT_COMPILER(); ?>"; // compressed file length does not match incompressed lentgh for an uncompressed file $files = array(); -$files['a'] = array('cont'=>'a','ulen'=>1,'clen'=>2);; +$files['a'] = array('cont'=>'a','ulen'=>1,'clen'=>2); include 'files/phar_test.inc'; try { include $fname; diff --git a/ext/phar/tests/pharfileinfo_getcrc32.phpt b/ext/phar/tests/pharfileinfo_getcrc32.phpt index dfa12f4ca4..436ac7c590 100644 --- a/ext/phar/tests/pharfileinfo_getcrc32.phpt +++ b/ext/phar/tests/pharfileinfo_getcrc32.phpt @@ -16,7 +16,7 @@ __HALT_COMPILER(); ?>"; // compressed file length does not match incompressed lentgh for an uncompressed file $files = array(); -$files['a/subdir/here'] = array('cont'=>'a','ulen'=>1,'clen'=>1);; +$files['a/subdir/here'] = array('cont'=>'a','ulen'=>1,'clen'=>1); include 'files/phar_test.inc'; $b = new PharFileInfo($pname . '/a/subdir'); @@ -46,4 +46,4 @@ echo $e->getMessage() . "\n"; Phar entry is a directory, does not have a CRC Phar entry was not CRC checked int(%s) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/posix/tests/posix_getuid_error.phpt b/ext/posix/tests/posix_getuid_error.phpt index e759e68bf5..42a35512a0 100644 --- a/ext/posix/tests/posix_getuid_error.phpt +++ b/ext/posix/tests/posix_getuid_error.phpt @@ -16,7 +16,7 @@ echo "*** Testing posix_getuid() : error conditions ***\n"; // One argument echo "\n-- Testing posix_getuid() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( posix_getuid($extra_arg) ); echo "Done"; diff --git a/ext/posix/tests/posix_times_error.phpt b/ext/posix/tests/posix_times_error.phpt index 2766bc9483..b705047358 100644 --- a/ext/posix/tests/posix_times_error.phpt +++ b/ext/posix/tests/posix_times_error.phpt @@ -16,7 +16,7 @@ echo "*** Testing posix_times() : error conditions ***\n"; // One argument echo "\n-- Testing posix_times() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( posix_times($extra_arg) ); echo "Done"; diff --git a/ext/posix/tests/posix_uname_error.phpt b/ext/posix/tests/posix_uname_error.phpt index 4c753feae4..b44f4ae8ca 100644 --- a/ext/posix/tests/posix_uname_error.phpt +++ b/ext/posix/tests/posix_uname_error.phpt @@ -16,7 +16,7 @@ echo "*** Testing posix_uname() : error conditions ***\n"; // One argument echo "\n-- Testing posix_uname() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( posix_uname($extra_arg) ); echo "Done"; diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 3f0d922318..b30ace1a7c 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -326,7 +326,7 @@ PHP_FUNCTION(readline_info) if (value) { /* XXX if (rl_readline_name) free(rl_readline_name); */ convert_to_string_ex(value); - rl_readline_name = strdup(Z_STRVAL_P(value));; + rl_readline_name = strdup(Z_STRVAL_P(value)); } RETVAL_STRING(SAFE_STRING(oldstr)); } else if (!strcasecmp(what, "attempted_completion_over")) { diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index badbf8eb88..c9243d6bcc 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4753,7 +4753,7 @@ ZEND_METHOD(reflection_class, newInstance) fcc.initialized = 1; fcc.function_handler = constructor; - fcc.calling_scope = zend_get_executed_scope();; + fcc.calling_scope = zend_get_executed_scope(); fcc.called_scope = Z_OBJCE_P(return_value); fcc.object = Z_OBJ_P(return_value); diff --git a/ext/soap/tests/bugs/bug29844.phpt b/ext/soap/tests/bugs/bug29844.phpt index efaccbc31a..a3006639b1 100644 --- a/ext/soap/tests/bugs/bug29844.phpt +++ b/ext/soap/tests/bugs/bug29844.phpt @@ -18,7 +18,7 @@ class LocalSoapClient extends SoapClient { function __construct($wsdl, $options) { parent::__construct($wsdl, $options); $this->server = new SoapServer($wsdl, $options); - $this->server->setClass('hello_world');; + $this->server->setClass('hello_world'); } function __doRequest($request, $location, $action, $version, $one_way = 0) { diff --git a/ext/standard/array.c b/ext/standard/array.c index 7055b2c86b..ab34ac4a28 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4549,7 +4549,7 @@ static int zval_user_compare(zval *a, zval *b) /* {{{ */ if (zend_call_function(&BG(user_compare_fci), &BG(user_compare_fci_cache)) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { zend_long ret = zval_get_long(&retval); zval_ptr_dtor(&retval); - return ret < 0 ? -1 : ret > 0 ? 1 : 0;; + return ret < 0 ? -1 : ret > 0 ? 1 : 0; } else { return 0; } diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c index d6776aaf96..cff0f9c4c2 100644 --- a/ext/standard/scanf.c +++ b/ext/standard/scanf.c @@ -921,7 +921,7 @@ literal: if (numVars) { char __buf[2]; __buf[0] = sch; - __buf[1] = '\0';; + __buf[1] = '\0'; current = args[objIndex++]; zval_dtor(*current); ZVAL_STRINGL( *current, __buf, 1); diff --git a/ext/standard/tests/array/sizeof_error.phpt b/ext/standard/tests/array/sizeof_error.phpt index 79a75f3153..c6274830cf 100644 --- a/ext/standard/tests/array/sizeof_error.phpt +++ b/ext/standard/tests/array/sizeof_error.phpt @@ -17,7 +17,7 @@ echo "-- Testing sizeof() with zero arguments --\n"; var_dump( sizeof() ); echo "-- Testing sizeof() function with more than two arguments under COUNT_NORMAL mode --\n"; $var = 100; -$extra_arg = 10;; +$extra_arg = 10; var_dump( sizeof($var, COUNT_NORMAL, $extra_arg) ); echo "-- Testing sizeof() function with more than two arguments under COUNT_RECURSIVE mode --\n"; var_dump( sizeof($var, COUNT_RECURSIVE, $extra_arg) ); diff --git a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt index d5b40beee8..ff01feb360 100644 --- a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt @@ -12,7 +12,7 @@ echo "*** Testing get_declared_classes() : error conditions ***\n"; // One argument echo "\n-- Testing get_declared_classes() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( get_declared_classes($extra_arg) ); echo "Done"; diff --git a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt index 2a7f308a34..63b02b85c3 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt @@ -12,7 +12,7 @@ echo "*** Testing get_declared_interfaces() : error conditions ***\n"; // One argument echo "\n-- Testing get_declared_interfaces() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( get_declared_interfaces($extra_arg) ); echo "Done"; diff --git a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt index f7a00da0dd..0d35fa6d13 100644 --- a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt @@ -12,7 +12,7 @@ echo "*** Testing get_declared_traits() : error conditions ***\n"; // One argument echo "\n-- Testing get_declared_traits() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( get_declared_traits($extra_arg) ); echo "Done"; diff --git a/ext/standard/tests/file/userstreams_003.phpt b/ext/standard/tests/file/userstreams_003.phpt index 01a8efbf5c..9ee71f2666 100644 --- a/ext/standard/tests/file/userstreams_003.phpt +++ b/ext/standard/tests/file/userstreams_003.phpt @@ -19,9 +19,9 @@ class test_wrapper extends test_wrapper_base { var_dump($value); echo "ptrparam:\n"; var_dump($ptrparam); - echo "\$option === $option === " . $this->expected_option . ":\n";; + echo "\$option === $option === " . $this->expected_option . ":\n"; var_dump($option === $this->expected_option); - echo "\$value === $value === " . $this->expected_value. ":\n";; + echo "\$value === $value === " . $this->expected_value. ":\n"; var_dump($value === $this->expected_value); return $this->return_value; } diff --git a/ext/standard/tests/filters/bug22538.phpt b/ext/standard/tests/filters/bug22538.phpt index 438b5be31f..0f007e47bb 100644 --- a/ext/standard/tests/filters/bug22538.phpt +++ b/ext/standard/tests/filters/bug22538.phpt @@ -24,8 +24,8 @@ while (($cnt -= $str_len) > 0) { } $cnt = $size - ($str_len + $cnt); fclose($fp); -$fin = fopen($path1, "r") or die("Can not open $path1\n");; -$fout = fopen($path2, "w") or die("Can not open $path2\n");; +$fin = fopen($path1, "r") or die("Can not open $path1\n"); +$fout = fopen($path2, "w") or die("Can not open $path2\n"); stream_filter_append($fout, "string.rot13"); my_stream_copy_to_stream($fin, $fout); fclose($fout); diff --git a/ext/standard/tests/network/closelog_error.phpt b/ext/standard/tests/network/closelog_error.phpt index ad3fdf557d..442f9a6249 100644 --- a/ext/standard/tests/network/closelog_error.phpt +++ b/ext/standard/tests/network/closelog_error.phpt @@ -12,7 +12,7 @@ echo "*** Testing closelog() : error conditions ***\n"; // One argument echo "\n-- Testing closelog() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( closelog($extra_arg) ); ?> diff --git a/ext/zip/tests/bug38944.phpt b/ext/zip/tests/bug38944.phpt index 7cff60c984..ede6b67e77 100644 --- a/ext/zip/tests/bug38944.phpt +++ b/ext/zip/tests/bug38944.phpt @@ -7,7 +7,7 @@ Bug #38944 (newly created ZipArchive segfaults when accessing comment property) $arc_name = dirname(__FILE__)."/bug38944.zip"; $foo = new ZipArchive; -$foo->open($arc_name, ZIPARCHIVE::CREATE);; +$foo->open($arc_name, ZIPARCHIVE::CREATE); var_dump($foo->status); var_dump($foo->statusSys); diff --git a/ext/zip/tests/bug40228-mb.phpt b/ext/zip/tests/bug40228-mb.phpt index 109172d2d5..db9e2e90d5 100644 --- a/ext/zip/tests/bug40228-mb.phpt +++ b/ext/zip/tests/bug40228-mb.phpt @@ -7,7 +7,7 @@ Bug #40228 (extractTo does not create recursive empty path) $dest = dirname(__FILE__); $arc_name = $dest . "/bug40228私はガラスを食べられます.zip"; $zip = new ZipArchive; -$zip->open($arc_name, ZIPARCHIVE::CREATE);; +$zip->open($arc_name, ZIPARCHIVE::CREATE); $zip->extractTo($dest); if (is_dir($dest . '/test/empty')) { echo "Ok\n"; diff --git a/ext/zip/tests/bug40228.phpt b/ext/zip/tests/bug40228.phpt index fec2963639..2691b3b22f 100644 --- a/ext/zip/tests/bug40228.phpt +++ b/ext/zip/tests/bug40228.phpt @@ -7,7 +7,7 @@ Bug #40228 (extractTo does not create recursive empty path) $dest = dirname(__FILE__); $arc_name = $dest . "/bug40228.zip"; $zip = new ZipArchive; -$zip->open($arc_name, ZIPARCHIVE::CREATE);; +$zip->open($arc_name, ZIPARCHIVE::CREATE); $zip->extractTo($dest); if (is_dir($dest . '/test/empty')) { echo "Ok\n"; diff --git a/ext/zlib/tests/gztell_basic2.phpt b/ext/zlib/tests/gztell_basic2.phpt index d7a55895ef..ded3fbee7c 100644 --- a/ext/zlib/tests/gztell_basic2.phpt +++ b/ext/zlib/tests/gztell_basic2.phpt @@ -15,7 +15,7 @@ $sizes = array(7, 22, 54, 17, 27, 15, 1000); var_dump(gztell($h)); foreach ($sizes as $size) { - echo "bytes written=".gzwrite($h, str_repeat('1', $size))."\n";; + echo "bytes written=".gzwrite($h, str_repeat('1', $size))."\n"; echo "tell=".gztell($h)."\n"; } @@ -39,4 +39,4 @@ bytes written=15 tell=142 bytes written=1000 tell=1142 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/zlib/tests/inflate_get_read_len.phpt b/ext/zlib/tests/inflate_get_read_len.phpt index 37c977789f..54555fa7ba 100644 --- a/ext/zlib/tests/inflate_get_read_len.phpt +++ b/ext/zlib/tests/inflate_get_read_len.phpt @@ -6,7 +6,7 @@ inflate_get_read_len() <?php $uncompressed = "Hello world."; -$random_junk = str_repeat("qebsouesl", 128);; +$random_junk = str_repeat("qebsouesl", 128); $compressed = zlib_encode($uncompressed, ZLIB_ENCODING_DEFLATE); $compressed_len = strlen($compressed); diff --git a/ext/zlib/tests/inflate_get_status.phpt b/ext/zlib/tests/inflate_get_status.phpt index d042840515..01387b8122 100644 --- a/ext/zlib/tests/inflate_get_status.phpt +++ b/ext/zlib/tests/inflate_get_status.phpt @@ -6,7 +6,7 @@ inflate_get_status() <?php $uncompressed = "Hello world."; -$random_junk = str_repeat("qebsouesl", 128);; +$random_junk = str_repeat("qebsouesl", 128); $compressed = zlib_encode($uncompressed, ZLIB_ENCODING_DEFLATE); $compressed_len = strlen($compressed); diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 4cd6cca854..537021abd6 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1007,7 +1007,7 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, zen /* fall through */ case PHP_STREAM_PERSISTENT_FAILURE: - efree(persistent_id);; + efree(persistent_id); return ret; } } diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index c9a946155a..8ab120a4b6 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1275,7 +1275,7 @@ static void fpm_conf_cleanup(int which, void *arg) /* {{{ */ static void fpm_conf_ini_parser_include(char *inc, void *arg) /* {{{ */ { char *filename; - int *error = (int *)arg;; + int *error = (int *)arg; #ifdef HAVE_GLOB glob_t g; #endif @@ -1490,17 +1490,17 @@ static void fpm_conf_ini_parser(zval *arg1, zval *arg2, zval *arg3, int callback switch(callback_type) { case ZEND_INI_PARSER_ENTRY: fpm_conf_ini_parser_entry(arg1, arg2, error); - break;; + break; case ZEND_INI_PARSER_SECTION: fpm_conf_ini_parser_section(arg1, error); - break;; + break; case ZEND_INI_PARSER_POP_ENTRY: fpm_conf_ini_parser_array(arg1, arg3, arg2, error); - break;; + break; default: zlog(ZLOG_ERROR, "[%s:%d] Unknown INI syntax", ini_filename, ini_lineno); *error = 1; - break;; + break; } } /* }}} */ diff --git a/tests/output/ob_clean_error_001.phpt b/tests/output/ob_clean_error_001.phpt index a1b9886f3e..8060c2be8b 100644 --- a/tests/output/ob_clean_error_001.phpt +++ b/tests/output/ob_clean_error_001.phpt @@ -12,7 +12,7 @@ echo "*** Testing ob_clean() : error conditions ***\n"; // One argument echo "\n-- Testing ob_clean() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( ob_clean($extra_arg) ); echo "Done"; diff --git a/tests/output/ob_end_flush_error_001.phpt b/tests/output/ob_end_flush_error_001.phpt index 7675f009e0..2cd9a64e0d 100644 --- a/tests/output/ob_end_flush_error_001.phpt +++ b/tests/output/ob_end_flush_error_001.phpt @@ -12,7 +12,7 @@ echo "*** Testing ob_end_flush() : error conditions ***\n"; // One argument echo "\n-- Testing ob_end_flush() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( ob_end_flush($extra_arg) ); echo "Done"; diff --git a/tests/output/ob_flush_error_001.phpt b/tests/output/ob_flush_error_001.phpt index f98504006a..f24a19b8ce 100644 --- a/tests/output/ob_flush_error_001.phpt +++ b/tests/output/ob_flush_error_001.phpt @@ -12,7 +12,7 @@ echo "*** Testing ob_flush() : error conditions ***\n"; // One argument echo "\n-- Testing ob_flush() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( ob_flush($extra_arg) ); echo "Done"; diff --git a/tests/output/ob_get_level_error_001.phpt b/tests/output/ob_get_level_error_001.phpt index 4719bdd72e..9694da54a0 100644 --- a/tests/output/ob_get_level_error_001.phpt +++ b/tests/output/ob_get_level_error_001.phpt @@ -12,7 +12,7 @@ echo "*** Testing ob_get_level() : error conditions ***\n"; // One argument echo "\n-- Testing ob_get_level() function with one argument --\n"; -$extra_arg = 10;; +$extra_arg = 10; var_dump( ob_get_level($extra_arg) ); echo "Done"; |