-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Comparing changes
Open a pull request
base repository: cakephp/cakephp
base: 5.x
head repository: cakephp/cakephp
compare: fix/phpstan-view-generic-types
- 13 commits
- 86 files changed
- 1 contributor
Commits on Jan 17, 2026
-
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.
Configuration menu - View commit details
-
Copy full SHA for 9d7e3de - Browse repository at this point
Copy the full SHA 9d7e3deView commit details -
Configuration menu - View commit details
-
Copy full SHA for 966e149 - Browse repository at this point
Copy the full SHA 966e149View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for bb4060a - Browse repository at this point
Copy the full SHA bb4060aView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 0ee1553 - Browse repository at this point
Copy the full SHA 0ee1553View commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for 3451aea - Browse repository at this point
Copy the full SHA 3451aeaView commit details -
Configuration menu - View commit details
-
Copy full SHA for ddf81af - Browse repository at this point
Copy the full SHA ddf81afView commit details
Commits on Jan 18, 2026
-
- Remove unused import EntityInterface from EagerLoader - Remove @inheritdoc when combined with @param/@return (coding standard violation) - Add proper type hints and @param annotations
Configuration menu - View commit details
-
Copy full SHA for f195061 - Browse repository at this point
Copy the full SHA f195061View commit details
Commits on Feb 1, 2026
-
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.
Configuration menu - View commit details
-
Copy full SHA for 7a9771b - Browse repository at this point
Copy the full SHA 7a9771bView commit details
Commits on Feb 3, 2026
-
Configuration menu - View commit details
-
Copy full SHA for 9242323 - Browse repository at this point
Copy the full SHA 9242323View commit details -
Configuration menu - View commit details
-
Copy full SHA for 77be5e6 - Browse repository at this point
Copy the full SHA 77be5e6View commit details
Commits on Feb 8, 2026
-
Configuration menu - View commit details
-
Copy full SHA for bbfe028 - Browse repository at this point
Copy the full SHA bbfe028View commit details
Commits on Feb 19, 2026
-
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
Configuration menu - View commit details
-
Copy full SHA for 704ee97 - Browse repository at this point
Copy the full SHA 704ee97View commit details
Commits on Feb 21, 2026
-
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.
Configuration menu - View commit details
-
Copy full SHA for a524e82 - Browse repository at this point
Copy the full SHA a524e82View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 5.x...fix/phpstan-view-generic-types