Add support for Eloquent $dates array as Carbon properties

Author: AJenbo

docs/CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - **Eloquent timestamp properties.** Models extending `Illuminate\Database\Eloquent\Model` now automatically get `created_at` and `updated_at` virtual properties typed as `Carbon\Carbon`. Setting `$timestamps = false` suppresses both. Overriding `CREATED_AT` or `UPDATED_AT` constants changes the column name; setting either to `null` disables that column. Explicit `$casts` entries (e.g. `'created_at' => 'immutable_datetime'`) take priority over the timestamp defaults.
+- **Eloquent `$dates` array.** Legacy models using `protected $dates = [...]` now get `Carbon\Carbon`-typed virtual properties for each listed column. Explicit `$casts` entries take priority when both define the same column.
 - **`fix` CLI subcommand.** `phpantom_lsp fix` applies automated code fixes across a project, modeled after php-cs-fixer. Specify rules with `--rule unused_import` (multiple allowed) or omit to run all preferred native fixers. `--dry-run` reports what would change without writing files (exit code 2). `--with-phpstan` enables PHPStan-based fixers (not yet implemented). The first shipped rule, `unused_import`, removes all unused `use` statements project-wide, handling simple imports, group imports, and blank-line collapsing. Supports path filtering (`fix src/`) and single-file mode.
 - **Array element type extraction from property generics.** Bracket access on properties annotated with generic array types (e.g. `$this->cache[$key]->` where `cache` is `array<string, IntCollection>`, or `$this->translations[0]->` where `translations` is `Collection<int, Translation>`) now resolves the element type correctly. Previously the generic parameters were lost during property chain resolution, causing "subject type could not be resolved" on any member access after the bracket. Works for `$this->prop`, `$obj->prop`, nested chains like `$this->nested->prop[0]->`, string-literal keys, and method chains after the bracket access.
 - **Template binding from closure return types.** Methods like `Collection::reduce()` that declare a method-level `@template` parameter bound through a callable's return type now resolve correctly. When the closure or arrow function argument has a return type annotation (e.g. `fn(Decimal $carry, $item): Decimal => ...`), the return type binds the template parameter, so the method's own return type resolves to the concrete class. This works for `fn()` arrow functions, `function()` closures, and closures with `use()` clauses.

docs/todo.md

@@ -21,16 +21,14 @@ within the same impact tier.
 
 ## Sprint 4 — Refactoring toolkit & type inference
 
-| #   | Item                                                                                                                                       | Impact | Effort     |
-| --- | ------------------------------------------------------------------------------------------------------------------------------------------ | ------ | ---------- |
-| T18 | [Method-level template parameter resolution at call sites](todo/type-inference.md#t18-method-level-template-parameter-resolution-at-call-sites) | Medium | Medium     |
-| L3  | [`$dates` array (deprecated)](todo/laravel.md#l3-dates-array-deprecated)                                                                     | Low-Med | Low       |
-| L11 | [`$appends` array](todo/laravel.md#l11-appends-array)                                                                                        | Low    | Low        |
-| L13 | [`where{PropertyName}()` dynamic methods on Builder](todo/laravel.md#l13-wherepropertyname-dynamic-methods-on-builder)                        | High   | Medium     |
-| H17 | [`missingType.iterableValue` — add `@return` with inferred element type](todo/phpstan-actions.md#h17-missingtype-iterablevalue-return-type--add-return-with-iterable-type) | Medium | High       |
-| H10 | [`return.unusedType` — remove unused type from return union](todo/phpstan-actions.md#h10-returnunusedtype--remove-unused-type-from-return-union) | Medium | Medium     |
-| H6  | `return.type` — update return type to match actual returns                                                                                   | Medium | Medium     |
-|     | **Release 0.7.0**                                                                                                                          |        |            |
+| #   | Item                                                                                                                                                                      | Impact  | Effort |
+| --- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | ------ |
+| L11 | [`$appends` array](todo/laravel.md#l11-appends-array)                                                                                                                     | Low     | Low    |
+| L13 | [`where{PropertyName}()` dynamic methods on Builder](todo/laravel.md#l13-wherepropertyname-dynamic-methods-on-builder)                                                     | High    | Medium |
+| H17 | [`missingType.iterableValue` — add `@return` with inferred element type](todo/phpstan-actions.md#h17-missingtype-iterablevalue-return-type--add-return-with-iterable-type)  | Medium  | High   |
+| H10 | [`return.unusedType` — remove unused type from return union](todo/phpstan-actions.md#h10-returnunusedtype--remove-unused-type-from-return-union)                            | Medium  | Medium |
+| H6  | `return.type` — update return type to match actual returns                                                                                                                 | Medium  | Medium |
+|     | **Release 0.7.0**                                                                                                                                                          |         |        |
 
 ## Sprint 5 — Polish for office adoption
 

docs/todo/laravel.md

@@ -213,27 +213,6 @@ relationship. It returns a `MorphToMany` instance (the same class as
 No other changes needed since `MorphToMany` is already in
 `COLLECTION_RELATIONSHIPS`.
 
-#### L3. `$dates` array (deprecated)
-
-**Impact: Low-Medium · Effort: Low**
-
-Only affects legacy codebases that haven't migrated to `$casts`.
-Decreasing relevance over time. New `extract_dates_definitions`
-function in `parser/classes.rs` + merge logic in the provider at
-lower priority than `$casts`.
-
-Before `$casts`, Laravel used `protected $dates = [...]` to mark
-columns as Carbon instances. This was deprecated in favour of
-`casts()` with a `datetime` type, but older codebases still use it.
-Columns listed in `$dates` should be typed as `\Carbon\Carbon`.
-
-**Where to change:** Add a new `extract_dates_definitions` function in
-`parser/classes.rs` (similar to `extract_column_names` but returning
-`Vec<(String, String)>` with each column mapped to `\Carbon\Carbon`).
-Merge these into `casts_definitions` at a lower priority than explicit
-`$casts` entries, or add a separate field on `ClassInfo` and handle
-priority in the provider.
-
 #### L4. Custom Eloquent builders (`HasBuilder` / `#[UseEloquentBuilder]`)
 
 **Impact: High · Effort: Medium**

docs/todo/type-inference.md

@@ -412,20 +412,6 @@ emits the concrete callable signature in the `@param` tag.
 
 ---
 
-## ~~T18. Method-level template parameter resolution at call sites~~ ✅ Resolved
-
-**Resolution:** Added `substitute_template_param_bounds()` in
-`src/completion/variable/resolution.rs` which replaces bare template
-parameter names (e.g. `T`, `TRelation`) with their `@template T of Bound`
-upper bounds before class resolution. Applied in both
-`resolve_variable_in_members` (method-level) and `try_resolve_in_function`
-(standalone function-level). Call-site substitution was already handled by
-`build_method_template_subs`; this fix addresses the **inside-the-body**
-case where `$query->where(...)` previously failed with "subject type 'T'
-could not be resolved".
-
----
-
 ## T19. Structured type representation
 **Impact: High · Effort: Very High**
 

example.php

@@ -1629,6 +1629,7 @@ public function demo(): void
         $bakery->baguettes;           // relationship HasMany       → Collection<Loaf>
         $bakery->baguettes_count;     // relationship count         → int
         $bakery->croissant;           // $attributes default        → string
+        $bakery->defrosted_at;        // $dates (deprecated)        → Carbon\Carbon
         $bakery->dough_temp;          // $casts 'float'             → float
         $bakery->egg_count;           // $attributes default        → int
         $bakery->flour;               // $fillable (no cast/attr)   → mixed
@@ -4670,6 +4671,8 @@ class Bakery extends \Illuminate\Database\Eloquent\Model
 
     protected $hidden = ['oven_code'];
 
+    protected $dates = ['defrosted_at'];
+
     protected $visible = ['rye_blend'];
 
     protected $casts = [

src/completion/variable/resolution.rs

@@ -625,11 +625,8 @@ fn try_resolve_in_function(
             );
         }
         // Bare template param → bound (e.g. `T` → `Builder|QueryBuilder`).
-        rt.type_string = substitute_template_param_bounds(
-            rt.type_string.clone(),
-            ctx.content,
-            func_start,
-        );
+        rt.type_string =
+            substitute_template_param_bounds(rt.type_string.clone(), ctx.content, func_start);
     }
 
     walk_statements_for_assignments(func.body.statements.iter(), &body_ctx, &mut results, false);
@@ -1012,14 +1009,14 @@ fn resolve_variable_in_members<'b>(
     vec![]
 }
 
-/// Walk statements collecting variable assignment types.
-///
-/// The `conditional` flag indicates whether we are inside a conditional
-/// block (if/else, try/catch, loop).  When `conditional` is `false`,
-/// a new assignment **replaces** all previous candidates (the variable
-/// is being unconditionally reassigned).  When `conditional` is `true`,
-/// a new assignment **adds** to the list (the variable *might* be this
-/// type).
+// Walk statements collecting variable assignment types.
+//
+// The `conditional` flag indicates whether we are inside a conditional
+// block (if/else, try/catch, loop).  When `conditional` is `false`,
+// a new assignment **replaces** all previous candidates (the variable
+// is being unconditionally reassigned).  When `conditional` is `true`,
+// a new assignment **adds** to the list (the variable *might* be this
+// type).
 
 /// Substitute method/function-level template parameter names with their
 /// upper bounds from `@template T of Bound` annotations.

src/parser/classes.rs

@@ -770,6 +770,44 @@ fn extract_column_names<'a>(
     names
 }
 
+/// Extract column names from the deprecated `$dates` property array.
+///
+/// Before `$casts`, Laravel used `protected $dates = [...]` to mark
+/// columns as Carbon instances. Each column listed here should be
+/// typed as `\Carbon\Carbon` by the virtual member provider.
+fn extract_dates_definitions<'a>(
+    members: impl Iterator<Item = &'a ClassLikeMember<'a>>,
+    content: &str,
+) -> Vec<String> {
+    let mut names = Vec::new();
+
+    for member in members {
+        if let ClassLikeMember::Property(Property::Plain(plain)) = member {
+            for item in plain.items.iter() {
+                let var_name = item.variable().name.to_string();
+                let stripped = var_name.strip_prefix('$').unwrap_or(&var_name);
+                if stripped != "dates" {
+                    continue;
+                }
+                if let PropertyItem::Concrete(concrete) = item {
+                    let span = concrete.value.span();
+                    let start = span.start.offset as usize;
+                    let end = span.end.offset as usize;
+                    if let Some(text) = content.get(start..end) {
+                        for name in parse_string_list(text) {
+                            if !names.contains(&name) {
+                                names.push(name);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    names
+}
+
 /// Parse a PHP array literal containing only string values.
 ///
 /// Accepts text starting with `[` and extracts bare string values
@@ -913,6 +951,9 @@ impl Backend {
 
                     let column_names = extract_column_names(class.members.iter(), content);
 
+                    let dates_definitions =
+                        extract_dates_definitions(class.members.iter(), content);
+
                     let (timestamps, created_at_name, updated_at_name) =
                         extract_timestamp_config(class.members.iter(), content);
 
@@ -959,6 +1000,7 @@ impl Backend {
                         laravel: Some(Box::new(LaravelMetadata {
                             custom_collection,
                             casts_definitions,
+                            dates_definitions,
                             attributes_definitions,
                             column_names,
                             timestamps,

src/types.rs

@@ -1268,6 +1268,15 @@ pub struct LaravelMetadata {
     /// properties, mapping cast type strings to PHP types (e.g.
     /// `datetime` to `Carbon\Carbon`, `boolean` to `bool`).
     pub casts_definitions: Vec<(String, String)>,
+    /// Column names extracted from the deprecated `$dates` property
+    /// array.
+    ///
+    /// Before `$casts`, Laravel used `protected $dates = [...]` to mark
+    /// columns as Carbon instances. Each column listed here is typed as
+    /// `Carbon\Carbon`. The `LaravelModelProvider` merges these at lower
+    /// priority than `$casts`: if a column appears in both `$casts` and
+    /// `$dates`, the cast type wins.
+    pub dates_definitions: Vec<String>,
     /// Eloquent attribute defaults extracted from the `$attributes`
     /// property initializer.
     ///

src/virtual_members/laravel/mod.rs

@@ -550,8 +550,22 @@ impl VirtualMemberProvider for LaravelModelProvider {
                 properties.push(PropertyInfo::virtual_property(column, Some(&php_type)));
             }
 
+            // ── $dates properties (deprecated, lower priority than $casts) ──
+            // Columns in `$dates` are typed as Carbon\Carbon unless already
+            // covered by an explicit `$casts` entry.
+            for column in &laravel.dates_definitions {
+                if !seen_props.insert(column.clone()) {
+                    continue;
+                }
+                properties.push(PropertyInfo::virtual_property(
+                    column,
+                    Some("Carbon\\Carbon"),
+                ));
+            }
+
             // ── Attribute default properties (fallback) ─────────────
-            // Only add properties for columns not already covered by $casts.
+            // Only add properties for columns not already covered by $casts
+            // or $dates.
             for (column, php_type) in &laravel.attributes_definitions {
                 if !seen_props.insert(column.clone()) {
                     continue;