Skip to content

COMOPS-1085: 1.0.0 release with Composer 1.10.6 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 28, 2020
Merged

COMOPS-1085: 1.0.0 release with Composer 1.10.6 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d970e34
Updating to composer 1.9.2 support
pdohogne-magento Feb 4, 2020
06087ac
Updating composer compatibility to 1.9.3
pdohogne-magento Feb 13, 2020
d720d4c
Merge branch '0.1.1' into develop
pdohogne-magento Feb 13, 2020
b9ff85e
COMOPS-1085: Updating composer requirement to 1.10.6
pdohogne-magento May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"AFL-3.0"
],
"require": {
"composer-plugin-api": "^1.0",
"composer/composer": "<=1.8.0"
"composer/composer": "<=1.10.6",
"composer-plugin-api": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~6.5.0"
Expand Down
1 change: 1 addition & 0 deletions src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/MageRootRequireCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ protected function configure()
);

$mageHelp = '

<comment>Magento Root Updates:</comment>
With <info>' . PluginDefinition::PACKAGE_NAME . "</info> installed, <info>$origName</info> will also check for and
execute any changes to the root composer.json file that exist between the Magento
Expand Down
6 changes: 3 additions & 3 deletions src/Magento/ComposerRootUpdatePlugin/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"name": "magento/composer-root-update-plugin",
"type": "composer-plugin",
"description": "Plugin to look ahead for Magento project root changes when running composer update for new Magento versions",
"version": "0.1.0",
"version": "1.0.0",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"require": {
"composer-plugin-api": "^1.0",
"composer/composer": "<=1.8.0"
"composer/composer": "<=1.10.6",
"composer-plugin-api": "^1.0"
},
"suggest": {
"magento/framework": "Enables the Magento Composer Root Update Plugin's functionality for the Web Setup Wizard"
Expand Down
10 changes: 9 additions & 1 deletion tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/DeltaResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,18 @@ public function setUp()
$this->console = new Console($this->io);
$this->retriever = $this->createPartialMock(
RootPackageRetriever::class,
['getOriginalRootPackage', 'getTargetRootPackage', 'getUserRootPackage']
[
'getOriginalRootPackage',
'getOriginalLabel',
'getTargetRootPackage',
'getTargetLabel',
'getUserRootPackage'
]
);
$this->retriever->method('getOriginalRootPackage')->willReturn(null);
$this->retriever->method('getOriginalLabel')->willReturn('Magento Open Source 1.0.0');
$this->retriever->method('getTargetRootPackage')->willReturn(null);
$this->retriever->method('getTargetLabel')->willReturn('Magento Open Source 2.0.0');
$this->retriever->method('getUserRootPackage')->willReturn(null);
}
}
4 changes: 4 additions & 0 deletions tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/MagentoRootUpdaterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,17 +310,21 @@ public function setUp()
'getOriginalRootPackage',
'getOriginalEdition',
'getOriginalVersion',
'getOriginalLabel',
'getTargetRootPackage',
'getTargetEdition',
'getTargetVersion',
'getTargetLabel',
'getUserRootPackage'
]);
$retriever->method('getOriginalRootPackage')->willReturn($baseRoot);
$retriever->method('getOriginalEdition')->willReturn('community');
$retriever->method('getOriginalVersion')->willReturn('1.0.0.0');
$retriever->method('getOriginalLabel')->willReturn('Magento Open Source 1.0.0');
$retriever->method('getTargetRootPackage')->willReturn($targetRoot);
$retriever->method('getTargetEdition')->willReturn('community');
$retriever->method('getTargetVersion')->willReturn('2.0.0.0');
$retriever->method('getTargetLabel')->willReturn('Magento Open Source 2.0.0');
$retriever->method('getUserRootPackage')->willReturn($installRoot);

$this->retriever = $retriever;
Expand Down