Revert composer stacked-dependency hack from #319#320
Merged
dereuromark merged 1 commit intomasterfrom Apr 20, 2026
Merged
Conversation
The repositories block plus dev-branch aliases were needed only while the upstream cakephp/cakephp and cakephp-shim branches were unmerged. Restore stable constraints.
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #320 +/- ##
=========================================
Coverage 80.09% 80.09%
Complexity 2133 2133
=========================================
Files 85 85
Lines 5904 5904
=========================================
Hits 4729 4729
Misses 1175 1175 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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.
Summary
The
repositoriesblock plus dev-branch aliases added in #319 (commit 8457535) were scaffolding only needed while the upstream branches incakephp/cakephpandcakephp-shimwere unmerged.Restores:
cakephp/cakephp": "^5.1.1dereuromark/cakephp-shim": "^3.0.0And removes the
repositoriesblock.The
TEntitytemplate added toModel/Table/Table.phpin the same commit stays — it works against the shim/cakephp once their respective companion PRs land with real versions.