Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cakephp/cakephp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5.x
Choose a base ref
...
head repository: cakephp/cakephp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fix/phpstan-view-generic-types
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 86 files changed
  • 1 contributor

Commits on Jan 17, 2026

  1. WIP: Add proper generic type annotations to fix PHPStan missingType.g…

    …enerics
    
    This is a work-in-progress to properly specify generic types instead of
    ignoring the missingType.generics errors in PHPStan.
    
    Changes include:
    - Add @template annotations to Helper, View subclasses, Cache classes
    - Add proper generic type parameters to method signatures
    - Fix Collection, ORM, Event system generic types
    
    Progress: ~210 of 405 errors fixed (52%)
    
    Remaining work needed for complete fix.
    dereuromark committed Jan 17, 2026
    Configuration menu
    Copy the full SHA
    9d7e3de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    966e149 View commit details
    Browse the repository at this point in the history
  3. Fix remaining missingType.generics errors

    Complete the fix for generic type annotations by:
    - Add generic types to Association.php methods (attachTo, find, etc.)
    - Add @phpstan-ignore for self-referential generics in EventDispatcherTrait
    - Fixes all remaining missingType.generics errors
    
    Remaining 69 errors are different types (return.type, argument.type,
    generics.interfaceConflict) not related to the original missingType.generics issue.
    dereuromark committed Jan 17, 2026
    Configuration menu
    Copy the full SHA
    bb4060a View commit details
    Browse the repository at this point in the history
  4. Fix PHPStan errors to make CI green

    - Add @phpstan-ignore comments for Collection return type mismatches
    - Add path-specific ignores for generics.interfaceConflict in TreeIterator/TreePrinter
    - Add path-specific ignores for argument.type covariance issues in Cache/ORM
    - Use consistent SelectQuery generic types in Association.php
    dereuromark committed Jan 17, 2026
    Configuration menu
    Copy the full SHA
    0ee1553 View commit details
    Browse the repository at this point in the history
  5. Move argument.type ignores to inline comments

    - Cache.php: inline ignore for NullEngine fallback
    - TableRegistry.php: inline ignore for TableLocator
    - bootstrap.php: inline ignore for TableLocator
    
    generics.interfaceConflict must remain in config (PHPStan limitation
    for class-level interface conflicts)
    dereuromark committed Jan 17, 2026
    Configuration menu
    Copy the full SHA
    3451aea View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ddf81af View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2026

  1. Fix phpcs violations

    - Remove unused import EntityInterface from EagerLoader
    - Remove @inheritdoc when combined with @param/@return (coding standard violation)
    - Add proper type hints and @param annotations
    dereuromark committed Jan 18, 2026
    Configuration menu
    Copy the full SHA
    f195061 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2026

  1. Merge 5.x into fix/phpstan-view-generic-types

    Resolve conflict in Hash.php: keep updated link URLs from 5.x
    and generic type annotations from this branch.
    dereuromark committed Feb 1, 2026
    Configuration menu
    Copy the full SHA
    7a9771b View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2026

  1. Configuration menu
    Copy the full SHA
    9242323 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    77be5e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2026

  1. Configuration menu
    Copy the full SHA
    bbfe028 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2026

  1. Merge 5.x and fix PHPStan generic type errors

    - Resolve merge conflict in CollectionTrait.php by keeping both generic
      templates and @require-implements annotation
    - Fix Association::find() return type to SelectQuery<EntityInterface|array>
      to be compatible with BelongsToMany::find() override
    dereuromark committed Feb 19, 2026
    Configuration menu
    Copy the full SHA
    704ee97 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2026

  1. Fix PHPStan errors in ORM association cascade delete methods

    Add @phpstan-ignore for argument.type errors where cascade callback
    code iterates over query results. The SelectQuery template includes
    array type for non-hydrated results, but cascade callbacks always
    use hydration, so entities are guaranteed.
    dereuromark committed Feb 21, 2026
    Configuration menu
    Copy the full SHA
    a524e82 View commit details
    Browse the repository at this point in the history
Loading