Repository navigation
Conversation
Dependencies: - cakephp/cakephp ^6.0, php >=8.4, cakephp-codesniffer ^6.0, phpunit ^13.0, rector ~2.6.0 (plus minimum-stability dev). Source changes (cakephp60 rector set + manual follow-up): - Entity access API renamed by Cake 6: setAccess()/accessibleFields became setPatchable()/patchableFields (Marshaller option included). - QueryInterface methods now declare `static` return types; Query::order() removed, applyOptions() maps `order` to orderBy(). - Finder option arrays are rejected with an InvalidArgumentException pointing at named arguments instead of being deprecated. - FixtureInterface::insert()/truncate() return void. - Document stores the Elastica result in $searchResult, and its clean path writes values through setRawValue() so declared fields stay initialised. - Index::saveMany() assigns the ES id/version with set() instead of direct property writes (Property PHPStan error on EntityInterface). - ValidationRule is readonly in Cake 6: DocumentContext reads ->name/->pass. - Plugin classes drop the underscore prefix convention (Query, Index, Connection, Marshaller, DocumentContext, IsUnique, ElasticLogger, ...); dynamic ES fields such as `_version` are left untouched. - Test plugin classes added for TestPlugin/TestPluginTwo: Cake 6 removed the BasePlugin fallback in PluginCollection::create(). Tooling: - rector.php targets PHP 8.4 and skips rector 2.5/2.6 docblock removal rules, mirroring debug_kit, so `composer rector-check` stays green without losing `@return $this` that PHPStan needs for fluent interfaces. CI/docs: - ci.yml pushes to 6.x, PHP matrix 8.4/8.5, prefer-lowest on 8.4. - docs-validation uses the cakephp/.github 6.x workflow. - deploy_docs_6x.yml added alongside the other major-version deployers. - README, docs version references and a new 6.0 upgrade guide. Tests: 472 tests, 1375 assertions, 0 failures/errors against Elasticsearch 9.1.5; phpcs and phpstan are clean.
markstory
approved these changes
Oct 4, 2026
Co-authored-by: Mark Story <mark@mark-story.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Dependencies:
Source changes (cakephp60 rector set + manual follow-up):
staticreturn types; Query::order() removed, applyOptions() mapsorderto orderBy()._versionare left untouched.Tooling:
composer rector-checkstays green without losing@return $thisthat PHPStan needs for fluent interfaces.CI/docs: