Skip to content

Commit

Permalink
Merge pull request #156 from neos/task/introduce-composer-patching
Browse files Browse the repository at this point in the history
TASK: Introduce Composer-based patching
  • Loading branch information
robertlemke authored Aug 18, 2020
2 parents 472f47c + 8cb9943 commit 5cac2c3
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 2 deletions.
1 change: 0 additions & 1 deletion .composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
],
"type": "neos-package-collection",
"require": {
"cweagans/composer-patches": "dev-master#a18d1ca38ae09d16aa21846f60649d99d6775639"
},
"replace": {
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/Readme.rst b/Readme.rst
index 6a23c0bd24410ae72eb070ff7728a2d3a2be9ff0..47384e2419246b7063bffaf0bd4ceb5f4ad74cef 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -68,3 +68,8 @@ To switch the branch you intend to work on:
.. note:: We use an upmerging strategy, so create all bugfixes to lowest maintained branch that contains the issue (typically the second last LTS release, which is 3.3 currently), or master for new features.

For more detailed information, see https://discuss.neos.io/t/development-setup/504 and https://discuss.neos.io/t/creating-a-pull-request/506
+
+Patched Version
+===============
+
+Note that this development collection was patched by the Event Sourced Neos Adjustments package (see: Packages/CR/Neos.EventSourcedNeosAdjustments/composer.patches.json)
7 changes: 7 additions & 0 deletions Neos.EventSourcedNeosAdjustments/composer.patches.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"patches": {
"neos/neos-development-collection": {
"neos_neos-development-collection_ReadMe": "Packages/CR/Neos.EventSourcedNeosAdjustments/Patches/neos_neos-development-collection_ReadMe.patch"
}
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"extra": {
"installer-name": "CR",
"neos": {
"warning": "AUTOGENERATED FILE, ONLY MODIFY THE .composer.json IN THIS DIRECTORY AND RUN THE MERGE SCRIPT."
"warning": "AUTOGENERATED FILE, ONLY MODIFY THE .composer.json IN THIS DIRECTORY AND RUN THE COMPOSER MANIFEST MERGER SCRIPT PROVIDED BY THE BUILD ESSENTIALS PACKAGE."
}
},
"autoload-dev": {
Expand Down

0 comments on commit 5cac2c3

Please sign in to comment.