Add echo api.

Author: jmjoy

examples/log/src/lib.rs

@@ -1,6 +1,6 @@
 use phper::{
-    deprecated, error, functions::Argument, modules::Module, notice, php_get_module, values::Val,
-    warning,
+    deprecated, echo, error, functions::Argument, modules::Module, notice, php_get_module,
+    values::Val, warning,
 };
 
 #[php_get_module]
@@ -10,6 +10,15 @@ pub fn get_module(module: &mut Module) {
     module.set_version(env!("CARGO_PKG_VERSION"));
     module.set_author(env!("CARGO_PKG_AUTHORS"));
 
+    module.add_function(
+        "log_say",
+        |params: &mut [Val]| {
+            let message = params[0].as_string();
+            echo!("Hello, {}!", message);
+        },
+        vec![Argument::by_val("message")],
+    );
+
     module.add_function(
         "log_notice",
         |params: &mut [Val]| {

examples/log/tests/integration.rs

@@ -3,6 +3,18 @@ use std::{env, path::Path, str};
 
 #[test]
 fn test_php() {
+    test_php_scripts_with_condition(
+        env!("CARGO_BIN_EXE_log"),
+        &[Path::new(env!("CARGO_MANIFEST_DIR"))
+            .join("tests")
+            .join("php")
+            .join("test_php_say.php")],
+        |output| {
+            let stdout = str::from_utf8(&output.stdout).unwrap();
+            stdout == "Hello, world!" && output.status.success()
+        },
+    );
+
     test_php_scripts_with_condition(
         env!("CARGO_BIN_EXE_log"),
         &[Path::new(env!("CARGO_MANIFEST_DIR"))

examples/log/tests/php/test_php_say.php

@@ -0,0 +1,7 @@
+<?php
+
+ini_set("display_errors", "On");
+ini_set("display_startup_errors", "On");
+error_reporting(E_ALL);
+
+log_say("world");

phper/src/functions.rs

@@ -1,17 +1,16 @@
 use std::{
     mem::zeroed,
     os::raw::c_char,
-    ptr::null,
     sync::atomic::{AtomicPtr, Ordering},
 };
 
 use crate::{
     classes::ClassEntry,
     objects::Object,
     sys::*,
+    utils::ensure_end_with_zero,
     values::{ExecuteData, SetVal, Val},
 };
-use crate::utils::ensure_end_with_zero;
 
 pub trait Function: Send + Sync {
     fn call(&self, arguments: &mut [Val], return_value: &mut Val);
@@ -163,17 +162,11 @@ pub(crate) unsafe extern "C" fn invoke(
 
     // Check arguments count.
     if execute_data.num_args() < execute_data.common_required_num_args() {
-        let s = format!(
+        warning!(
             "expects at least {} parameter(s), {} given\0",
             execute_data.common_required_num_args(),
             execute_data.num_args()
         );
-        php_error_docref1(
-            null(),
-            "\0".as_ptr().cast(),
-            E_WARNING as i32,
-            s.as_ptr().cast(),
-        );
         return_value.set(());
         return;
     }

phper/src/lib.rs

@@ -131,9 +131,9 @@ pub mod cmd;
 mod errors;
 pub mod functions;
 pub mod ini;
-pub mod logs;
 pub mod modules;
 pub mod objects;
+pub mod output;
 pub mod strings;
 mod utils;
 pub mod values;

phper/src/macros.rs

@@ -1,27 +1,34 @@
+#[macro_export]
+macro_rules! echo {
+    ($($arg:tt)*) => ({
+        $crate::output::echo(std::format!($($arg)*))
+    })
+}
+
 #[macro_export]
 macro_rules! error {
     ($($arg:tt)*) => ({
-        phper::logs::log(phper::logs::Level::Error, std::format!($($arg)*))
+        $crate::output::log($crate::output::LogLevel::Error, std::format!($($arg)*))
     })
 }
 
 #[macro_export]
 macro_rules! warning {
     ($($arg:tt)*) => ({
-        phper::logs::log(phper::logs::Level::Warning, std::format!($($arg)*))
+        $crate::output::log($crate::output::LogLevel::Warning, std::format!($($arg)*))
     })
 }
 
 #[macro_export]
 macro_rules! notice {
     ($($arg:tt)*) => ({
-        phper::logs::log(phper::logs::Level::Notice, std::format!($($arg)*))
+        $crate::output::log($crate::output::LogLevel::Notice, std::format!($($arg)*))
     })
 }
 
 #[macro_export]
 macro_rules! deprecated {
     ($($arg:tt)*) => ({
-        phper::logs::log(phper::logs::Level::Deprecated, std::format!($($arg)*))
+        $crate::output::log($crate::output::LogLevel::Deprecated, std::format!($($arg)*))
     })
 }

phper/src/modules.rs

@@ -4,6 +4,7 @@ use crate::{
     functions::{Argument, Callable, Function, FunctionEntity},
     ini::{IniEntity, IniValue, Policy, StrPtrBox},
     sys::*,
+    utils::ensure_end_with_zero,
     EXCEPTION_CLASS_NAME,
 };
 use once_cell::sync::Lazy;
@@ -16,7 +17,6 @@ use std::{
     ptr::{null, null_mut},
     sync::RwLock,
 };
-use crate::utils::ensure_end_with_zero;
 
 static GLOBAL_MODULE: Lazy<RwLock<Module>> = Lazy::new(Default::default);
 

phper/src/logs.rs renamed to phper/src/output.rs

@@ -3,14 +3,14 @@ use std::ptr::null;
 
 #[repr(u32)]
 #[derive(Copy, Clone, PartialEq)]
-pub enum Level {
+pub enum LogLevel {
     Error = E_ERROR,
     Warning = E_WARNING,
     Notice = E_NOTICE,
     Deprecated = E_DEPRECATED,
 }
 
-pub fn log(level: Level, message: impl ToString) {
+pub fn log(level: LogLevel, message: impl ToString) {
     let message = ensure_end_with_zero(message);
     unsafe {
         php_error_docref1(
@@ -21,3 +21,13 @@ pub fn log(level: Level, message: impl ToString) {
         );
     }
 }
+
+pub fn echo(message: impl ToString) {
+    let message = ensure_end_with_zero(message);
+    unsafe {
+        zend_write.expect("function zend_write can't be null")(
+            message.as_ptr().cast(),
+            message.len() - 1,
+        );
+    }
+}

phper/src/values.rs

@@ -1,6 +1,5 @@
-use crate::{arrays::Array, errors::Throwable, sys::*};
+use crate::{arrays::Array, errors::Throwable, sys::*, utils::ensure_end_with_zero};
 use std::{mem::zeroed, slice::from_raw_parts, str, sync::atomic::Ordering};
-use crate::utils::ensure_end_with_zero;
 
 #[repr(transparent)]
 pub struct ExecuteData {