Fixing PHP warnings, removing drupal-security-advisories.

acquia · Dec 16, 2016 · 677f305 · 677f305
1 parent 64ca8a7
commit 677f305
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Update/DoPackagistConverter.php b/src/Update/DoPackagistConverter.php
@@ -60,7 +60,7 @@ public static function convertComposerJson($composer_json) {
    * @return string
    *   The to packages.drupal.org/8 style constraint.
    */
-  protected function convertVersionConstraint($version_constraint) {
+  protected static function convertVersionConstraint($version_constraint) {
 
     /*
       * 8.2.x-dev => 2.x-dev

diff --git a/src/Update/Updates.php b/src/Update/Updates.php
@@ -75,6 +75,8 @@ public function update_860() {
   public function update_862() {
     $composer_json = $this->updater->getComposerJson();
     DoPackagistConverter::convertComposerJson($composer_json);
+    // This package is not compatible with D.O style version constraints.
+    unset($composer_json['require']['drupal-composer/drupal-security-advisories']);
     $this->updater->writeComposerJson($composer_json);
   }