Code style

Author: arnaud-lb

Zend/zend_language_scanner.l

@@ -685,7 +685,7 @@ ZEND_API zend_op_array *zend_compile_ast(
 {
 	zend_string *original_compiled_filename = CG(compiled_filename);
 	bool original_in_compilation = CG(in_compilation);
-	CG(in_compilation) = 1;
+	CG(in_compilation) = true;
 	CG(ast) = ast;
 
 	zend_set_compiled_filename(filename);

Zend/zend_partial.c

@@ -378,9 +378,8 @@ static zend_result zp_get_param_default_value(zval *result, zend_function *funct
 		if (EXPECTED(opline->opcode == ZEND_RECV_INIT)) {
 			ZVAL_COPY(result, RT_CONSTANT(opline, opline->op2));
 			return SUCCESS;
-		} else {
-			ZEND_ASSERT(opline->opcode == ZEND_RECV);
 		}
+		ZEND_ASSERT(opline->opcode == ZEND_RECV);
 	} else {
 		if (function->common.fn_flags & ZEND_ACC_USER_ARG_INFO) {
 			goto error;

ext/opcache/ZendAccelerator.c

@@ -2034,7 +2034,7 @@ static char *zend_accel_uintptr_hex(char *dest, uintptr_t n)
 static zend_string *zend_accel_pfa_key(const zend_op *declaring_opline,
 		const zend_function *called_function)
 {
-	size_t key_len = strlen(PFA_KEY_PREFIX) + (sizeof(uintptr_t)*2) + strlen(":") + (sizeof(uintptr_t)*2);
+	const size_t key_len = strlen(PFA_KEY_PREFIX) + (sizeof(uintptr_t)*2) + strlen(":") + (sizeof(uintptr_t)*2);
 	zend_string *key = zend_string_alloc(key_len, 0);
 	char *dest = ZSTR_VAL(key);