Simplify PHAR compiler

phpstan · Apr 16, 2020 · f31ee7c · f31ee7c
1 parent cb79f86
commit f31ee7c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/compiler/build/box.json b/compiler/build/box.json
@@ -9,9 +9,9 @@
   "directories": [
     "conf",
     "src",
-    "stubs",
-    "vendor"
+    "stubs"
   ],
+  "force-autodiscovery": true,
   "output": "tmp/phpstan.phar",
   "php-scoper": "compiler/build/scoper.inc.php"
 }
diff --git a/compiler/src/Console/CompileCommand.php b/compiler/src/Console/CompileCommand.php
@@ -49,7 +49,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$this->fixComposerJson($this->buildDir);
 		$this->renamePhpStormStubs();
-		$this->processFactory->create(['composer', 'update', '--no-dev', '--classmap-authoritative'], $this->buildDir);
 
 		$this->processFactory->create(['php', 'box.phar', 'compile', '--no-parallel'], $this->dataDir);
 
@@ -60,9 +59,6 @@ private function fixComposerJson(string $buildDir): void
 	{
 		$json = json_decode($this->filesystem->read($buildDir . '/composer.json'), true);
 
-		// remove dev dependencies (they create conflicts)
-		unset($json['require-dev'], $json['autoload-dev']);
-
 		unset($json['replace']);
 		$json['name'] = 'phpstan/phpstan';
 

diff --git a/compiler/tests/Console/CompileCommandTest.php b/compiler/tests/Console/CompileCommandTest.php
@@ -22,6 +22,8 @@ public function testCommand(): void
     "require": {
         "php": "~7.1"
     },
+    "require-dev": 1,
+    "autoload-dev": 2,
     "autoload": {
         "psr-4": {
             "PHPStan\\\\": "src/"
@@ -35,8 +37,7 @@ public function testCommand(): void
 
 		$processFactory = $this->createMock(ProcessFactory::class);
 		$processFactory->expects(self::at(0))->method('setOutput');
-		$processFactory->expects(self::at(1))->method('create')->with(['composer', 'update', '--no-dev', '--classmap-authoritative'], 'bar')->willReturn($process);
-		$processFactory->expects(self::at(2))->method('create')->with(['php', 'box.phar', 'compile', '--no-parallel'], 'foo')->willReturn($process);
+		$processFactory->expects(self::at(1))->method('create')->with(['php', 'box.phar', 'compile', '--no-parallel'], 'foo')->willReturn($process);
 
 		$application = new Application();
 		$application->add(new CompileCommand($filesystem, $processFactory, 'foo', 'bar'));