Update recompose to work better with CWP #145
Merged
Conversation
This file contains 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
11 tasks
maxime-rainville
changed the title
bergice
reviewed
Jan 16, 2019
| use SilverStripe\Upgrader\Util\ConfigFile; | ||
|
|
||
| /** | ||
| * Trait to encapsualte basic logic for retrieving upgrading config. |
| * @return bool | ||
| */ | ||
| protected function recipeCoreTargetIsInstalled(ComposerExec $composer, string $targetRecipeCore): bool | ||
| protected function targetsInstalled(ComposerExec $composer, array $targets): bool |
There was a problem hiding this comment.
PHPDoc needs to be updated.
tests/Composer/Rules/RebuildTest.php
Outdated
| { | ||
| $composer = new ComposerExec(__DIR__); | ||
| $rule = new Rebuild('1.1'); | ||
| $rule = new Rebuild(["silverstripe/recipe-core" => "1.1"], $this->recipeEquivalences); |
There was a problem hiding this comment.
Single quotes are preferred.
tests/Composer/Rules/RebuildTest.php
Outdated
| @@ -38,74 +48,98 @@ class RebuildTest extends TestCase | |||
| 'other' => ['composer/semver'], | |||
| ]; | |||
|
|
|||
| public function testSwitchToRecipeCore() | |||
| private $recipeEquivalences = [ | |||
| "silverstripe/framework" => ["silverstripe/recipe-core"], | |||
There was a problem hiding this comment.
Single quotes are preferred.
added 20 commits
January 16, 2019 15:08
…uire any dependency.
maxime-rainville
force-pushed
the
pulls/cwp-recipe-improvement
branch
from
bd0f213 to
bf4e81e
Compare
bergice
approved these changes
Jan 16, 2019
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.
The purpose of the PR is to enable recompose to work with CWP recipes.
Summary of changes
--cwp-constraintflag. When this is provided it overrides--recipe-core-constraint. This means the primary constraint when installing dependency is driven bycwp/cwp-recipe-coreinstead of bysilverstripe/recipe-core.SilverStripe\Upgrader\Composer\Rules\Rebuildnow accepts a list of packages targets. This takes the form of packages that will be locked to a specific version requirements.SilverStripe\Upgrader\Composer\Rules\Rebuildhas been made more flexible when substituting packages for recipes. Therecipe-coreandrecipe-cmssubstitution are no longer hard coded in Rebuild. Instead the recipe substitution can be provided to the constructor, which allows us to add cwp rules..upgrade.yml. The project owner can either do it in their own.upgrade.ymlfile or module maintainer could add it to their legacy project. Note that this is bit awkward because this file needs to be added to the SS3 module for it to work, because recompose is called before the project is using SS4 modules.composer.lockfile after eachrequirecall, this makes it less likely that an implicit dependency will conflict with one of explicit dependency ;ComposerExec::TEMP_SCHEMA_CONTENTnow include an explicit conflict onsilverstripe/recipe-coreandsilverstripe/recipe-cms4.0/4.1, forcing Rebuild to default to the 1.0/1.1 alias.--verboseflag is set.Parent issue