fix: address PR #46 review comments (6 fixes)

- Fix misleading 'Enrich DONE' log emitted before Blade analysis (enricher.go)
- Fix wc_hook signature to use real WP functions (add_action/add_filter/etc.)
- Populate WooCommerce APICalls via woocommerceAnalyzer.Analyze() in AST walk
- Add missing AST cases to extractExprValue (ScalarDnumber, ExprConstFetch, ExprClassConstFetch)
- Fix Blade reSection regex to capture inline sections like @section('title', 'Dashboard')
- Set EndLine on blade_template chunks using TotalLines from BladeTemplate struct

Signed-off-by: doITmagic <razvan@doitmagic.com>

Author: razvan

pkg/parser/php/laravel/adapter.go

@@ -297,12 +297,18 @@ func (a *Adapter) convertBladeToChunks(templates []BladeTemplate) []php.CodeChun
 			})
 		}
 
+		endLine := tpl.TotalLines
+		if endLine < 1 {
+			endLine = 1
+		}
+
 		chunk := php.CodeChunk{
 			Name:      tpl.Name,
 			Type:      "blade_template",
 			Language:  "php",
 			FilePath:  tpl.FilePath,
 			StartLine: 1,
+			EndLine:   endLine,
 			Signature: sig,
 			Docstring: docstring,
 			Metadata: map[string]any{

pkg/parser/php/laravel/blade.go

@@ -13,7 +13,7 @@ import (
 // Compiled regex patterns for Blade directives
 var (
 	reExtends   = regexp.MustCompile(`@extends\(\s*['"](.+?)['"]\s*\)`)
-	reSection   = regexp.MustCompile(`@section\(\s*['"](.+?)['"]\s*\)`)
+	reSection   = regexp.MustCompile(`@section\(\s*['"](.+?)['"]\s*(?:,.*?)?\)`)
 	reYield     = regexp.MustCompile(`@yield\(\s*['"](.+?)['"]\s*\)`)
 	reInclude   = regexp.MustCompile(`@include\(\s*['"](.+?)['"]\s*\)`)
 	reComponent = regexp.MustCompile(`@component\(\s*['"](.+?)['"]\s*\)`)
@@ -128,6 +128,8 @@ func (ba *BladeAnalyzer) analyzeFile(filePath string) (BladeTemplate, error) {
 		}
 	}
 
+	tpl.TotalLines = lineNum
+
 	return tpl, scanner.Err()
 }
 

pkg/parser/php/laravel/enricher.go

@@ -123,7 +123,7 @@ func (e *Enricher) Enrich(ca *php.CodeAnalyzer, packages []*php.PackageInfo, pat
 		}
 	}
 
-	logger.Instance.Debug("[LARAVEL] Enrich DONE: returning %d total chunks (before blade)", len(chunks))
+	logger.Instance.Debug("[LARAVEL] Enrich: %d chunks after routes, before blade analysis", len(chunks))
 
 	// Analyze Blade Templates
 	bladeFiles := e.adapter.findBladeFiles(paths)

pkg/parser/php/laravel/types.go

@@ -132,13 +132,14 @@ type Middleware struct {
 
 // BladeTemplate represents a parsed Blade template with its directives
 type BladeTemplate struct {
-	Name     string         `json:"name"`              // dot notation: layouts.app
-	FilePath string         `json:"file_path"`
-	Extends  string         `json:"extends,omitempty"`  // @extends('...')
-	Sections []BladeSection `json:"sections,omitempty"`
-	Includes []BladeInclude `json:"includes,omitempty"`
-	Stacks   []string       `json:"stacks,omitempty"`   // @push/@stack names
-	Props    []string       `json:"props,omitempty"`    // @props([...])
+	Name       string         `json:"name"`              // dot notation: layouts.app
+	FilePath   string         `json:"file_path"`
+	TotalLines int            `json:"total_lines"`        // total line count of the file
+	Extends    string         `json:"extends,omitempty"`  // @extends('...')
+	Sections   []BladeSection `json:"sections,omitempty"`
+	Includes   []BladeInclude `json:"includes,omitempty"`
+	Stacks     []string       `json:"stacks,omitempty"`   // @push/@stack names
+	Props      []string       `json:"props,omitempty"`    // @props([...])
 }
 
 // BladeSection represents a @section or @yield directive

pkg/parser/php/wordpress/analyzer.go

@@ -80,6 +80,7 @@ func (a *Analyzer) AnalyzePaths(paths []string) ([]php.CodeChunk, error) {
 // analyzeWordPress performs complete WordPress analysis using both package info and AST
 func (a *Analyzer) analyzeWordPress(packages []*php.PackageInfo, paths []string) *WordPressInfo {
 	info := &WordPressInfo{}
+	var wcAPICalls []woocommerce.WCAPICall
 
 	// Analyze from parsed package info (method calls)
 	info.Hooks = a.hookAnalyzer.AnalyzeHooks(packages)
@@ -149,6 +150,12 @@ func (a *Analyzer) analyzeWordPress(packages []*php.PackageInfo, paths []string)
 				}
 			}
 
+			// WooCommerce API calls from AST
+			wcInfo := a.woocommerceAnalyzer.Analyze(rootNode, path)
+			if wcInfo != nil && len(wcInfo.APICalls) > 0 {
+				wcAPICalls = append(wcAPICalls, wcInfo.APICalls...)
+			}
+
 			return nil
 		})
 	}
@@ -173,8 +180,11 @@ func (a *Analyzer) analyzeWordPress(packages []*php.PackageInfo, paths []string)
 		})
 	}
 	wcHooks := a.woocommerceAnalyzer.AnalyzeHooksFromWP(wcInputHooks)
-	if len(wcHooks) > 0 {
-		wcInfo := &woocommerce.WooCommerceInfo{Hooks: wcHooks}
+	if len(wcHooks) > 0 || len(wcAPICalls) > 0 {
+		wcInfo := &woocommerce.WooCommerceInfo{
+			Hooks:    wcHooks,
+			APICalls: wcAPICalls,
+		}
 		info.WooCommerceInfo = wcInfo
 	}
 
@@ -428,7 +438,7 @@ func (a *Analyzer) convertToChunks(info *WordPressInfo) []php.CodeChunk {
 					FilePath:  wcHook.FilePath,
 					StartLine: wcHook.StartLine,
 					EndLine:   wcHook.EndLine,
-					Signature: fmt.Sprintf("%s('%s', '%s')", wcHook.HookType, wcHook.HookName, wcHook.Callback),
+					Signature: buildWCHookSignature(wcHook),
 					Docstring: fmt.Sprintf("WooCommerce %s hook (%s area): %s", wcHook.HookType, wcHook.Area, wcHook.HookName),
 					Metadata: map[string]any{
 						"framework": "wordpress",
@@ -504,6 +514,33 @@ func buildHookSignature(hook WPHook) string {
 	}
 }
 
+// buildWCHookSignature creates a readable signature for a WooCommerce hook
+// using the real WordPress function names instead of raw hook type values
+func buildWCHookSignature(wcHook woocommerce.WCHook) string {
+	switch wcHook.HookType {
+	case "action":
+		if wcHook.Priority > 0 {
+			return fmt.Sprintf("add_action('%s', '%s', %d)", wcHook.HookName, wcHook.Callback, wcHook.Priority)
+		}
+		return fmt.Sprintf("add_action('%s', '%s')", wcHook.HookName, wcHook.Callback)
+	case "filter":
+		if wcHook.Priority > 0 {
+			return fmt.Sprintf("add_filter('%s', '%s', %d)", wcHook.HookName, wcHook.Callback, wcHook.Priority)
+		}
+		return fmt.Sprintf("add_filter('%s', '%s')", wcHook.HookName, wcHook.Callback)
+	case "action_trigger":
+		return fmt.Sprintf("do_action('%s')", wcHook.HookName)
+	case "filter_trigger":
+		return fmt.Sprintf("apply_filters('%s')", wcHook.HookName)
+	case "action_removal":
+		return fmt.Sprintf("remove_action('%s', '%s')", wcHook.HookName, wcHook.Callback)
+	case "filter_removal":
+		return fmt.Sprintf("remove_filter('%s', '%s')", wcHook.HookName, wcHook.Callback)
+	default:
+		return fmt.Sprintf("%s('%s', '%s')", wcHook.HookType, wcHook.HookName, wcHook.Callback)
+	}
+}
+
 // IsWordPressProject detects if the given paths contain a WordPress project.
 // It first checks the paths directly (directory-level indicators, plugin headers),
 // then walks UP parent directories to find WordPress root indicators.

pkg/parser/php/wordpress/woocommerce/analyzer.go

@@ -333,6 +333,8 @@ func extractExprValue(expr ast.Vertex) string {
 		return val
 	case *ast.ScalarLnumber:
 		return string(n.Value)
+	case *ast.ScalarDnumber:
+		return string(n.Value)
 	case *ast.Name:
 		var parts []string
 		for _, part := range n.Parts {
@@ -341,6 +343,14 @@ func extractExprValue(expr ast.Vertex) string {
 			}
 		}
 		return strings.Join(parts, "\\")
+	case *ast.ExprConstFetch:
+		return extractExprValue(n.Const)
+	case *ast.ExprClassConstFetch:
+		if constName, ok := n.Const.(*ast.Identifier); ok {
+			if string(constName.Value) == "class" {
+				return extractExprValue(n.Class) + "::class"
+			}
+		}
 	case *ast.ExprVariable:
 		if nameNode, ok := n.Name.(*ast.Identifier); ok {
 			name := string(nameNode.Value)