Merge pull request #873 from ergebnis/fix/allow-plugins

Fix: Allow `ergebnis/composer-normalize` to run as composer plugin
ergebnis · Jan 22, 2022 · c7a5254 · c7a5254
2 parents a4d41aa + 38dc976
commit c7a5254
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 6 deletions.
diff --git a/.../Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json b/.../Integration/Command/NormalizeCommand/Extra/NotValid/AdditionalKeys/fixture/composer.json
@@ -17,5 +17,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...egration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json b/...egration/Command/NormalizeCommand/Extra/NotValid/IndentSize/Missing/fixture/composer.json
@@ -14,5 +14,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...mmand/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json b/...mmand/NormalizeCommand/Extra/NotValid/IndentSize/NotGreaterThanZero/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...ation/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json b/...ation/Command/NormalizeCommand/Extra/NotValid/IndentSize/NotInteger/fixture/composer.json
@@ -17,5 +17,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...gration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json b/...gration/Command/NormalizeCommand/Extra/NotValid/IndentStyle/Missing/fixture/composer.json
@@ -14,5 +14,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...n/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json b/...n/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotSpaceOrTab/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...ation/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json b/...ation/Command/NormalizeCommand/Extra/NotValid/IndentStyle/NotString/fixture/composer.json
@@ -17,5 +17,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithOptions/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Extra/Valid/WithoutOptions/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/.../NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json b/.../NormalizeCommand/Json/Valid/Lock/NotPresent/Json/AlreadyNormalized/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "php": "^5.6",
     "ext-json": "*"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...d/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json b/...d/NormalizeCommand/Json/Valid/Lock/NotPresent/Json/NotYetNormalized/fixture/composer.json
@@ -9,5 +9,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...eCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json b/...eCommand/Json/Valid/Lock/Present/FreshBefore/Json/AlreadyNormalized/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "php": "^5.6",
     "ext-json": "*"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...alid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json b/...alid/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/FreshAfter/fixture/composer.json
@@ -10,5 +10,10 @@
     "php": "^5.6",
     "ext-json": "*"
   },
-  "_comment": "This composer.json is valid according to a lax validation, a composer.lock is present and fresh before invoking the command, composer.json is not yet normalized, and composer.lock is still fresh after invoking the command."
+  "_comment": "This composer.json is valid according to a lax validation, a composer.lock is present and fresh before invoking the command, composer.json is not yet normalized, and composer.lock is still fresh after invoking the command.",
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
+  }
 }
diff --git a/...d/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json b/...d/Lock/Present/FreshBefore/Json/NotYetNormalized/Lock/NotFreshAfter/fixture/composer.json
@@ -13,5 +13,10 @@
   "scripts": {
     "hello": "echo 'Hello!'"
   },
-  "_comment": "This composer.json is valid according to a lax validation, a composer.lock is present and fresh before invoking the command, composer.json is not yet normalized, and composer.lock is not fresh after invoking the command."
+  "_comment": "This composer.json is valid according to a lax validation, a composer.lock is present and fresh before invoking the command, composer.json is not yet normalized, and composer.lock is not fresh after invoking the command.",
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
+  }
 }
diff --git a/.../Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json b/.../Lock/Present/NotFreshBefore/WithNoCheckLock/Json/AlreadyNormalized/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "php": "^5.6",
     "ext-json": "*"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...d/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json b/...d/Lock/Present/NotFreshBefore/WithNoCheckLock/Json/NotYetNormalized/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/...zeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json b/...zeCommand/Json/Valid/Lock/Present/NotFreshBefore/WithoutNoCheckLock/fixture/composer.json
@@ -15,5 +15,10 @@
   "require": {
     "php": "^5.6",
     "ext-json": "*"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Normalizer/Throws/fixture/composer.json
@@ -9,5 +9,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json b/test/Integration/Command/NormalizeCommand/Options/NotValid/fixture/composer.json
@@ -9,5 +9,10 @@
   "require": {
     "ext-json": "*",
     "php": "^5.6"
+  },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
   }
 }
diff --git a/test/Util/Scenario.php b/test/Util/Scenario.php
@@ -72,10 +72,6 @@ public function consoleParameters(): array
     {
         $parameters = [
             'command' => 'normalize',
-            /**
-             * @see https://github.com/composer/composer/blob/2.2.3/src/Composer/Plugin/PluginManager.php#L702-L744
-             */
-            '--no-interaction' => true,
         ];
 
         if ($this->commandInvocation->is(CommandInvocation::usingFileArgument())) {