Skip to content

Commit c6098f8

Browse files
authored
Fix #3730. Remove patch to drupal/core (#3735)
* Remove patches * Have to disable test temporarily to fix the release.
1 parent 34375f5 commit c6098f8

File tree

4 files changed

+3
-15
lines changed

4 files changed

+3
-15
lines changed

composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@
125125
"sut/themes/contrib/{$name}": ["type:drupal-theme"],
126126
"sut/drush/contrib/{$name}": ["type:drupal-drush"]
127127
},
128-
"patches": {
129-
"drupal/core": {
130-
"Allow updating modules with new service dependencies https://www.drupal.org/project/drupal/issues/2863986": "https://www.drupal.org/files/issues/2863986-2-49.patch"
131-
}
132-
},
133128
"branch-alias": {
134129
"dev-master": "9.x-dev"
135130
}

scenarios/isolation-phpunit4/composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@
105105
"sut/themes/contrib/{$name}": ["type:drupal-theme"],
106106
"sut/drush/contrib/{$name}": ["type:drupal-drush"]
107107
},
108-
"patches": {
109-
"drupal/core": {
110-
"Allow updating modules with new service dependencies https://www.drupal.org/project/drupal/issues/2863986": "https://www.drupal.org/files/issues/2863986-2-49.patch"
111-
}
112-
},
113108
"branch-alias": {
114109
"dev-master": "9.x-dev"
115110
}

scenarios/isolation/composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@
105105
"sut/themes/contrib/{$name}": ["type:drupal-theme"],
106106
"sut/drush/contrib/{$name}": ["type:drupal-drush"]
107107
},
108-
"patches": {
109-
"drupal/core": {
110-
"Allow updating modules with new service dependencies https://www.drupal.org/project/drupal/issues/2863986": "https://www.drupal.org/files/issues/2863986-2-49.patch"
111-
}
112-
},
113108
"branch-alias": {
114109
"dev-master": "9.x-dev"
115110
}

tests/UpdateDBTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ public function testFailedPostUpdate()
219219
*/
220220
public function testUpdateModuleWithServiceDependency()
221221
{
222+
223+
$this->markTestSkipped('Requires a patched Drupal. See https://github.com/drush-ops/drush/pull/3735.');
224+
222225
$root = $this->webroot();
223226
$this->setUpDrupal(1, true);
224227
$options = [

0 commit comments

Comments
 (0)