Fix reading output directory config from composer.json

Mister-42 · web-flow · commit e88154a7f7ea · 2021-03-10T23:34:30.000+03:00
diff --git a/src/ComposerEventHandler.php b/src/ComposerEventHandler.php
@@ -32,9 +32,7 @@
 final class ComposerEventHandler implements PluginInterface, EventSubscriberInterface
 {
     private const MERGE_PLAN_FILENAME = 'merge_plan.php';
-    private const DEFAULT_OUTPUT_PATH = '/config/packages';
-    private const DEFAULT_CONFIG_SOURCE_PATH = '/config';
-
+    private const DEFAULT_OUTPUT_PATH = 'config/packages';
     private const DIST_DIRECTORY = 'dist';
 
     private ?Composer $composer = null;
@@ -217,7 +215,7 @@ private function getPluginConfig(PackageInterface $package): array
      */
     private function getPluginOutputDirectory(PackageInterface $package): string
     {
-        return $this->getRootPath() . (string)($package->getExtra()['config-plugin']['config-plugin-output-dir'] ?? self::DEFAULT_OUTPUT_PATH);
+        return $this->getRootPath() . '/' . (string)($package->getExtra()['config-plugin-output-dir'] ?? self::DEFAULT_OUTPUT_PATH);
     }
 
     private function ensureDirectoryExists(string $directoryPath): void

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,7 @@`
`32`	`32`	`final class ComposerEventHandler implements PluginInterface, EventSubscriberInterface`
`33`	`33`	`{`
`34`	`34`	`private const MERGE_PLAN_FILENAME = 'merge_plan.php';`
`35`		`- private const DEFAULT_OUTPUT_PATH = '/config/packages';`
`36`		`- private const DEFAULT_CONFIG_SOURCE_PATH = '/config';`
`37`		`-`
	`35`	`+ private const DEFAULT_OUTPUT_PATH = 'config/packages';`
`38`	`36`	`private const DIST_DIRECTORY = 'dist';`
`39`	`37`
`40`	`38`	`private ?Composer $composer = null;`
`@@ -217,7 +215,7 @@ private function getPluginConfig(PackageInterface $package): array`
`217`	`215`	`*/`
`218`	`216`	`private function getPluginOutputDirectory(PackageInterface $package): string`
`219`	`217`	`{`
`220`		`- return $this->getRootPath() . (string)($package->getExtra()['config-plugin']['config-plugin-output-dir'] ?? self::DEFAULT_OUTPUT_PATH);`
	`218`	`+ return $this->getRootPath() . '/' . (string)($package->getExtra()['config-plugin-output-dir'] ?? self::DEFAULT_OUTPUT_PATH);`
`221`	`219`	`}`
`222`	`220`
`223`	`221`	`private function ensureDirectoryExists(string $directoryPath): void`