Remove superfluous semicolons

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

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--

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;

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 {

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;
 								}

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;

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 */

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) );
 
 ?>

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();
 

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==
+==DONE==

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);

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();

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);

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);

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) {

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!
+done!

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);
 

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";
 }

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);

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 */

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;

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));
 

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);
 				}

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;

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===
+===DONE===

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";

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";

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";

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")) {

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);
 

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) {

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;
 	}

ext/standard/scanf.c

@@ -921,7 +921,7 @@ PHPAPI int php_sscanf_internal( char *string, char *format,
 					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);

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) );

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";

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";

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";