Auto-commit: Sync changes [2026-02-18]

Author: Jonathan D.A. Jewell

src/Sanctify/Transform/Sanitize.hs

@@ -30,6 +30,7 @@ import Data.Text (Text)
 import qualified Data.Text as T
 
 import Sanctify.AST
+import Sanctify.WordPress.Constraints (isWpdbObject)
 
 -- | Context for output escaping
 data EscapeContext
@@ -255,16 +256,16 @@ transformModernizeCrypto file = file { phpStatements = map (mapStatement moderni
 
     modernizeNode loc@(Located pos expr@(ExprCall callee args)) =
         case functionName callee of
-            Just fn | fn == "rand" -> Located pos $ ExprCall (makeConst "random_int") (map updateArg args)
-                    | fn == "md5" -> Located pos $ ExprCall (makeConst "hash") (Argument Nothing (Located pos $ ExprLiteral $ LitString "sha3-256") False : map updateArg args)
-                    | fn == "sha1" -> Located pos $ ExprCall (makeConst "sodium_crypto_generichash") (map updateArg args)
+            Just fn | fn == "rand" -> Located pos $ ExprCall (makeConst pos "random_int") (map updateArg args)
+                    | fn == "md5" -> Located pos $ ExprCall (makeConst pos "hash") (Argument Nothing (Located pos $ ExprLiteral $ LitString "sha3-256") False : map updateArg args)
+                    | fn == "sha1" -> Located pos $ ExprCall (makeConst pos "sodium_crypto_generichash") (map updateArg args)
             _ -> loc
 
     modernizeNode loc = loc
 
     updateArg (Argument name value unpack) = Argument name (modernizeExpr value) unpack
 
-    makeConst name = Located pos $ ExprConstant $ QualifiedName [Name name] False
+    makeConst p name = Located p $ ExprConstant $ QualifiedName [Name name] False
 
     functionName (Located _ (ExprConstant (QualifiedName parts _))) = Just $ unName $ last parts
     functionName _ = Nothing
@@ -324,7 +325,7 @@ mapStatement f (Located pos stmt) = Located pos (case stmt of
     StmtContinue n -> StmtContinue n
     StmtEcho exprs -> StmtEcho (map f exprs)
     StmtGlobal vars -> StmtGlobal vars
-    StmtStatic pairs -> StmtStatic (map (ib -> (fst fib, fmap f (snd fib))) pairs)
+    StmtStatic pairs -> StmtStatic (map (\(var, mexpr) -> (var, fmap f mexpr)) pairs)
     StmtUnset exprs -> StmtUnset (map f exprs)
     StmtDeclare decls body -> StmtDeclare decls (map (mapStatement f) body)
     StmtNoop -> StmtNoop)

src/Sanctify/Transform/TypeHints.hs

@@ -21,7 +21,7 @@ import qualified Data.Text as T
 import Data.Maybe (fromMaybe, mapMaybe)
 
 import Sanctify.AST
-import Sanctify.Analysis.Types
+import Sanctify.Analysis.Types (TypeContext, emptyTypeContext, InferredType)
 
 -- | Add type hints to function parameters based on defaults and usage
 addParameterTypeHints :: TypeContext -> Declaration -> Declaration
@@ -257,3 +257,11 @@ addAllTypeHints ctx file = file
     addMethodReturnHint c meth@MemberMethod{methReturn = Nothing, methBody = Just body} =
         meth { methReturn = inferReturnType c body }
     addMethodReturnHint _ meth = meth
+
+-- | Run the type hint inference pipeline on a PHP file
+transformAddTypeHints :: PhpFile -> PhpFile
+transformAddTypeHints = addAllTypeHints emptyTypeContext
+
+-- | Apply all type hint transformations with a fresh context
+transformAddTypeHints :: PhpFile -> PhpFile
+transformAddTypeHints = addAllTypeHints emptyTypeContext

test/SecuritySpec.hs

@@ -9,6 +9,7 @@ import Sanctify.Parser
 import Sanctify.Analysis.Security
 import Sanctify.Analysis.Advanced
 import Sanctify.WordPress.Security
+import Sanctify.AST (Located)
 
 spec :: Spec
 spec = do

test/TransformSpec.hs

@@ -10,7 +10,7 @@ import Sanctify.AST
 import Sanctify.Emit
 import Sanctify.Transform.Sanitize
 import Sanctify.Transform.Strict
-import Sanctify.Transform.TypeHints
+import Sanctify.Transform.TypeHints (transformAddTypeHints)
 
 spec :: Spec
 spec = do