Skip to content

Commit 45174a0

Browse files
committed
Change the extra config key name to 'patchset' to avoid conflict with other patching plugins
1 parent 4b1d2e3 commit 45174a0

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Build Status](https://travis-ci.org/creativestyle/composer-plugin-patchset.svg?branch=master)](https://travis-ci.org/creativestyle/composer-plugin-patchset)
2+
13
Composer Plugin For Applying Patchsets
24
======================================
35

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "creativestyle/composer-plugin-patchset",
3-
"description": "Composer plugin that automatically applies patches from a patchset file",
3+
"description": "Composer plugin that automatically applies patches from a patchset package",
44
"type": "composer-plugin",
55
"license": "OSL-3.0",
66
"authors": [

src/PatchCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected function collectFromPackage(PackageInterface $package)
7979
return [];
8080
}
8181

82-
return $this->createPatches($package->getName(), $package->getExtra()['patches']);
82+
return $this->createPatches($package->getName(), $package->getExtra()['patchset']);
8383
}
8484

8585
/**
@@ -88,7 +88,7 @@ protected function collectFromPackage(PackageInterface $package)
8888
*/
8989
public function isAValidPatchset(PackageInterface $package)
9090
{
91-
return $package->getType() === 'patchset' && isset($package->getExtra()['patches']);
91+
return $package->getType() === 'patchset' && isset($package->getExtra()['patchset']);
9292
}
9393

9494
/**

tests/Functional/Fixtures/packages/patchset/v1.0/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"creativestyle/composer-plugin-patchset": "*"
77
},
88
"extra": {
9-
"patches": {
9+
"patchset": {
1010
"test/simple-package": [
1111
{
1212
"description": "Patch in echo in the middle",

0 commit comments

Comments
 (0)