Merge pull request #127 from php-etl/fix/composer-from-local

fix composer.from_local
php-etl · Sep 14, 2023 · 89ed54f · 89ed54f
2 parents 85404bf + cba0155
commit 89ed54f
Show file tree

Hide file tree

Showing 7 changed files with 534 additions and 600 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Adapter/Composer.php b/src/Adapter/Composer.php
@@ -174,20 +174,6 @@ public function autoload(array $autoloads): void
         file_put_contents($this->workdir.'/composer.json', json_encode($composer, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
     }
 
-    public function install(): void
-    {
-        $this->command(
-            'composer',
-            'install',
-            '--prefer-dist',
-            '--no-progress',
-            '--prefer-stable',
-            '--sort-packages',
-            '--optimize-autoloader',
-            '--no-dev',
-        );
-    }
-
     public function addGithubRepository(string $name, string $url): void
     {
         $this->command(

diff --git a/src/Adapter/Docker/Factory.php b/src/Adapter/Docker/Factory.php
@@ -60,9 +60,6 @@ public function __invoke(array $configuration): Configurator\SatelliteBuilderInt
                 } else {
                     $builder->withComposerFile(new Packaging\Asset\LocalFile('composer.json'));
                 }
-                if (file_exists('vendor')) {
-                    $builder->withDirectory(new Packaging\Directory('vendor/'));
-                }
             }
 
             if (\array_key_exists('autoload', $configuration['composer']) && \array_key_exists('psr4', $configuration['composer']['autoload'])) {

diff --git a/src/Adapter/Docker/SatelliteBuilder.php b/src/Adapter/Docker/SatelliteBuilder.php
@@ -164,7 +164,6 @@ public function build(): Configurator\SatelliteInterface
             }
 
             $dockerfile->push(new Dockerfile\PHP\Composer());
-            $dockerfile->push(new Dockerfile\PHP\ComposerInstall());
         } else {
             $dockerfile->push(new Dockerfile\PHP\Composer());
             $dockerfile->push(new Dockerfile\PHP\ComposerInit(sprintf('satellite/%s', substr(hash('sha512', random_bytes(64)), 0, 64))));

diff --git a/src/Adapter/Filesystem/Factory.php b/src/Adapter/Filesystem/Factory.php
@@ -30,17 +30,14 @@ public function __invoke(array $configuration): Configurator\SatelliteBuilderInt
             if (\array_key_exists('from_local', $configuration['composer']) && true === $configuration['composer']['from_local']) {
                 if (file_exists('composer.lock')) {
                     $builder->withComposerFile(
-                        new Packaging\Asset\LocalFile('composer.json'),
-                        new Packaging\Asset\LocalFile('composer.lock'),
+                        new Packaging\File('composer.json', new Packaging\Asset\LocalFile('composer.json')),
+                        new Packaging\File('composer.lock', new Packaging\Asset\LocalFile('composer.lock')),
                     );
                 } else {
                     $builder->withComposerFile(
-                        new Packaging\Asset\LocalFile('composer.json'),
+                        new Packaging\File('composer.json', new Packaging\Asset\LocalFile('composer.json')),
                     );
                 }
-                if (file_exists('vendor')) {
-                    $builder->withDirectory(new Packaging\Directory('vendor/'));
-                }
             }
 
             if (\array_key_exists('autoload', $configuration['composer']) && \array_key_exists('psr4', $configuration['composer']['autoload'])) {

diff --git a/src/Adapter/Filesystem/SatelliteBuilder.php b/src/Adapter/Filesystem/SatelliteBuilder.php
@@ -129,8 +129,6 @@ public function build(): Configurator\SatelliteInterface
             if (null !== $this->composerLockFile) {
                 $satellite->withFile($this->composerLockFile);
             }
-
-            $composer->install();
         } else {
             $composer->init(sprintf('satellite/%s', substr(hash('sha512', random_bytes(64)), 0, 64)));
             $composer->minimumStability('dev');

diff --git a/src/Adapter/Tar/Factory.php b/src/Adapter/Tar/Factory.php
@@ -33,9 +33,6 @@ public function __invoke(array $configuration): Configurator\SatelliteBuilderInt
                 } else {
                     $builder->withComposerFile(new Packaging\Asset\LocalFile('composer.json'));
                 }
-                if (file_exists('vendor')) {
-                    $builder->withDirectory(new Packaging\Directory('vendor/'));
-                }
             }
 
             if (\array_key_exists('autoload', $configuration['composer']) && \array_key_exists('psr4', $configuration['composer']['autoload'])) {