Fix to pass the CI.

Author: jmjoy

.github/workflows/ci.yml

@@ -46,10 +46,6 @@ jobs:
           command: fmt
           args: --all -- --check
 
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-
       - uses: actions-rs/cargo@v1
         with:
           command: test

phper-alloc/src/lib.rs

@@ -3,28 +3,27 @@
 use phper_sys::{_efree, _emalloc};
 use std::{
     alloc::{AllocError, AllocRef, Layout},
-    os::raw::c_char,
     ptr::{slice_from_raw_parts_mut, NonNull},
 };
 
 pub type EBox<T> = Box<T, Allocator>;
 
 pub struct Allocator {
     #[cfg(phper_debug)]
-    zend_filename: *const c_char,
+    zend_filename: *const std::os::raw::c_char,
     #[cfg(phper_debug)]
     zend_lineno: u32,
     #[cfg(phper_debug)]
-    zend_orig_filename: *const c_char,
+    zend_orig_filename: *const std::os::raw::c_char,
     #[cfg(phper_debug)]
     zend_orig_lineno: u32,
 }
 
 impl Allocator {
     pub const fn new(
-        #[cfg(phper_debug)] zend_filename: *const c_char,
+        #[cfg(phper_debug)] zend_filename: *const std::os::raw::c_char,
         #[cfg(phper_debug)] zend_lineno: u32,
-        #[cfg(phper_debug)] zend_orig_filename: *const c_char,
+        #[cfg(phper_debug)] zend_orig_filename: *const std::os::raw::c_char,
         #[cfg(phper_debug)] zend_orig_lineno: u32,
     ) -> Self {
         Self {

phper-build/src/lib.rs

@@ -19,6 +19,11 @@ pub fn register_configures() {
         "cargo:rustc-cfg=phper_release_version=\"{}\"",
         PHP_RELEASE_VERSION
     );
+    println!(
+        "cargo:rustc-cfg=phper_php_version=\"{}.{}\"",
+        PHP_MAJOR_VERSION,
+        PHP_MINOR_VERSION,
+    );
 
     if PHP_DEBUG > 0 {
         println!("cargo:rustc-cfg=phper_debug");

phper/src/zend/api.rs

@@ -5,7 +5,6 @@ use crate::{
 use std::{
     cell::Cell,
     mem::{size_of, transmute},
-    os::raw::c_int,
     ptr::null_mut,
 };
 
@@ -35,6 +34,16 @@ impl<T: 'static> ModuleGlobals<T> {
         on_modify: Option<Mh>,
         modifiable: u32,
     ) -> zend_ini_entry_def {
+        #[cfg(phper_php_version = "7.3")]
+        let modifiable = modifiable as std::os::raw::c_uchar;
+        #[cfg(phper_php_version = "7.2")]
+        let modifiable = modifiable as std::os::raw::c_int;
+
+        #[cfg(phper_php_version = "7.3")]
+        let name_length = name.len() as u16;
+        #[cfg(phper_php_version = "7.2")]
+        let name_length = name.len() as u32;
+
         zend_ini_entry_def {
             name: name.as_ptr().cast(),
             on_modify,
@@ -43,8 +52,8 @@ impl<T: 'static> ModuleGlobals<T> {
             mh_arg3: null_mut(),
             value: default_value.as_ptr().cast(),
             displayer: None,
-            modifiable: modifiable as c_int,
-            name_length: name.len() as u32,
+            modifiable,
+            name_length,
             value_length: default_value.len() as u32,
         }
     }