smarter dump

Author: MekDrop

src/CommandProvider.php

@@ -18,9 +18,11 @@ class CommandProvider implements CommandProviderCapability {
 	public function getCommands() {
 		$file = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'generated' . DIRECTORY_SEPARATOR . 'data.php';
 		$commands = file_exists($file) ? include($file) : [];
-		if (is_array($commands) === false) {
-			$commands = [];
-		}
-		return array_filter((array)$commands);
+		return array_map(
+			static function ($class) {
+				return new ProxyCommand($class);
+			},
+			array_filter('class_exists', $commands)
+		);
 	}
 }

src/DefaultDumpWriter.php

@@ -15,18 +15,18 @@ class DefaultDumpWriter implements DumpWriterInterface
 	protected $filename;
 
 	/**
-	 * Generated source
+	 * Command classes
 	 *
-	 * @var string
+	 * @var string[]
 	 */
-	protected $source;
+	protected $commands = [];
 
 	/**
-	 * Command classes
+	 * Boot scripts
 	 *
 	 * @var string[]
 	 */
-	protected $commands = [];
+	protected $boot = [];
 
 	/**
 	 * Constructor
@@ -36,10 +36,6 @@ class DefaultDumpWriter implements DumpWriterInterface
 	public function __construct(string $filename)
 	{
 		$this->filename = $filename;
-		$this->source = sprintf(
-			'<?php%1$suse Imponeer\\ComposerCustomCommands\\ProxyCommand;%1$s%1$srequire_once(dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . "autoload.php");%1$s',
-			PHP_EOL
-		);
 	}
 
 	/**
@@ -50,11 +46,7 @@ public function __construct(string $filename)
 	public function writeToFile(): bool
 	{
 		$ret = $this->source . PHP_EOL;
-		$ret .= 'return [' . PHP_EOL;
-		foreach ($this->commands as $command) {
-			$ret .= str_repeat(' ', 4) . 'class_exists(' . json_encode($command) . ') ? ' . ' new ProxyCommand(' . $command . '::class) : null,' . PHP_EOL;
-		}
-		$ret .= '];' . PHP_EOL;
+		$ret .= '<?php return ' . var_export(['commands' => $this->commands, 'boot' => $this->boot], true) . ';';
 
 		return (bool)file_put_contents($this->filename, $ret, LOCK_EX);
 	}
@@ -76,10 +68,6 @@ public function addCommands(array $commands): void
 	 */
 	public function addBootScript(string $bootScript): void
 	{
-		$this->source .= sprintf(
-			'try {%2$s    file_exists(%1$s) && include_once(%1$s);%2$s} catch (\\Exception $ex) {%2$s}%2$s',
-			json_encode($bootScript),
-			PHP_EOL
-		);
+		$this->boot[] = $bootScript;
 	}
 }

src/ProxyCommand.php

@@ -58,6 +58,11 @@ public function __construct($composerCommandClass)
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
+		require_once(dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . "autoload.php");
+
+		foreach (require (dirname(__DIR__) . DIRECTORY_SEPARATOR . 'generated' . DIRECTORY_SEPARATOR . 'data.php')['boot'] as $something) {
+			require_once $something;
+		}
 
 		$_SERVER['HTTP_HOST'] = null;