Improved optimzations and namespace handling, courtesy Arnaud.

Author: Crell

Zend/zend_compile.c

@@ -6437,19 +6437,29 @@ static void zend_compile_pipe(znode *result, zend_ast *ast)
 	znode wrapped_operand_result;
 	zend_emit_op_tmp(&wrapped_operand_result, ZEND_QM_ASSIGN, &operand_result, NULL);
 
+	zend_ast *arg_list_ast = zend_ast_create_list(1, ZEND_AST_ARG_LIST, zend_ast_create_znode(&wrapped_operand_result));
+	zend_ast *fcall_ast;
+
+	znode callable_result;
+
 	/* Turn $foo |> bar(...) into bar($foo). */
 	if (callable_ast->kind == ZEND_AST_CALL
 	    && callable_ast->child[1]->kind == ZEND_AST_CALLABLE_CONVERT) {
-		callable_ast = callable_ast->child[0];
+		fcall_ast = zend_ast_create(ZEND_AST_CALL,
+				callable_ast->child[0], arg_list_ast);
+	/* Turn $foo |> $bar->baz(...) into $bar->baz($foo). */
+	} else if (callable_ast->kind == ZEND_AST_METHOD_CALL
+			&& callable_ast->child[2]->kind == ZEND_AST_CALLABLE_CONVERT) {
+		fcall_ast = zend_ast_create(ZEND_AST_METHOD_CALL,
+				callable_ast->child[0], callable_ast->child[1], arg_list_ast);
+	/* Turn $foo |> $expr into ($expr)($foo) */
+	} else {
+		zend_compile_expr(&callable_result, callable_ast);
+		callable_ast = zend_ast_create_znode(&callable_result);
+		fcall_ast = zend_ast_create(ZEND_AST_CALL,
+				callable_ast, arg_list_ast);
 	}
 
-	znode callable_result;
-	zend_compile_expr(&callable_result, callable_ast);
-
-	zend_ast *fcall_ast = zend_ast_create(ZEND_AST_CALL,
-	                                      zend_ast_create_znode(&callable_result),
-	                                      zend_ast_create_list(1, ZEND_AST_ARG_LIST, zend_ast_create_znode(&wrapped_operand_result)));
-
 	zend_compile_expr(result, fcall_ast);
 }