Skip cargo test on Linux for now...

Because the Linux build happens in a docker task, the PHP headers
are not available to build ext-php-rs, which is required to do the
cargo test.

Author: Qard

.github/workflows/CI.yml

@@ -298,6 +298,7 @@ jobs:
       # TODO: This should be moved to the test jobs, but needs build deps
       # for ext-php-rs to build correctly, including PHP cli
       - name: Test crates
+        if: ${{ contains(matrix.target, 'linux') }}
         shell: bash
         run: cargo test
       - name: Upload target-specific package for ${{ matrix.settings.target }}

crates/php/src/exception.rs

@@ -28,7 +28,9 @@ impl std::fmt::Display for EmbedException {
       EmbedException::SapiNotInitialized => write!(f, "Failed to initialize SAPI"),
       EmbedException::SapiLockFailed => write!(f, "Failed to acquire SAPI lock"),
       EmbedException::SapiMissingStartupFunction => write!(f, "Missing SAPI startup function"),
-      EmbedException::FailedToFindExeLocation => write!(f, "Failed to identify executable location"),
+      EmbedException::FailedToFindExeLocation => {
+        write!(f, "Failed to identify executable location")
+      }
       EmbedException::DocRootNotFound(docroot) => write!(f, "Document root not found: {}", docroot),
       EmbedException::SapiNotStarted => write!(f, "Failed to start SAPI"),
       EmbedException::SapiRequestNotStarted => write!(f, "Failed to start SAPI request"),
@@ -39,8 +41,12 @@ impl std::fmt::Display for EmbedException {
       EmbedException::Exception(e) => write!(f, "Exception thrown: {}", e),
       EmbedException::Bailout => write!(f, "PHP bailout"),
       EmbedException::ResponseBuildError => write!(f, "Failed to build response"),
-      EmbedException::FailedToFindCurrentDirectory => write!(f, "Failed to identify current directory"),
-      EmbedException::ExpectedAbsoluteRequestUri(e) => write!(f, "Expected absolute REQUEST_URI: {}", e),
+      EmbedException::FailedToFindCurrentDirectory => {
+        write!(f, "Failed to identify current directory")
+      }
+      EmbedException::ExpectedAbsoluteRequestUri(e) => {
+        write!(f, "Expected absolute REQUEST_URI: {}", e)
+      }
       EmbedException::ScriptNotFound(e) => write!(f, "Script not found: {}", e),
     }
   }

crates/php/src/strings.rs

@@ -64,24 +64,16 @@ where
 {
   let docroot = docroot.as_ref().to_path_buf();
   let request_uri = request_uri.as_ref();
-  let relative_uri = request_uri
-    .strip_prefix("/")
-    .map_err(|_| {
-      let uri = request_uri.display().to_string();
-      EmbedException::ExpectedAbsoluteRequestUri(uri)
-    })?;
+  let relative_uri = request_uri.strip_prefix("/").map_err(|_| {
+    let uri = request_uri.display().to_string();
+    EmbedException::ExpectedAbsoluteRequestUri(uri)
+  })?;
 
-  let exact = docroot
-    .join(relative_uri);
+  let exact = docroot.join(relative_uri);
 
-  exact
-    .join("index.php")
-    .canonicalize()
-    .or_else(|_| {
-      exact
-        .canonicalize()
-        .map_err(|_| {
-          EmbedException::ScriptNotFound(exact.display().to_string())
-        })
-    })
+  exact.join("index.php").canonicalize().or_else(|_| {
+    exact
+      .canonicalize()
+      .map_err(|_| EmbedException::ScriptNotFound(exact.display().to_string()))
+  })
 }