Added some composer authentication types

.php-cs-fixer.dist.php

@@ -35,6 +35,11 @@
         'ereg_to_preg' => true,
         'dir_constant' => true,
         'method_chaining_indentation' => false,
+        'string_implicit_backslashes' => [
+            'single_quoted' => 'escape',
+            'heredoc' => 'escape',
+            'double_quoted' => 'escape'
+        ]
     ])
     ->setFinder($finder)
     ->setCacheFile('.php-cs-fixer.cache') // forward compatibility with 3.x line

composer.json

@@ -32,7 +32,7 @@
         "php-etl/configurator-contracts": "0.8.*",
         "php-etl/satellite-toolbox": "*",
         "php-etl/gyroscops-api-client": "^0.3.0",
-        "php-etl/dockerfile": "*",
+        "php-etl/dockerfile": "dev-composer-authentication",
         "composer/composer": "*",
         "symfony/deprecation-contracts": "*",
         "react/child-process": "^0.7",

phpunit.xml

@@ -1,41 +1,26 @@
 <?xml version="1.0"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
-        backupGlobals="true"
-        colors="false"
-        processIsolation="false"
-        stopOnError="false"
-        stopOnFailure="false"
-        stopOnIncomplete="false"
-        stopOnSkipped="false"
-        stopOnRisky="false"
-        timeoutForSmallTests="1"
-        timeoutForMediumTests="10"
-        timeoutForLargeTests="60"
-        cacheDirectory=".phpunit.cache"
-        backupStaticProperties="false"
-        requireCoverageMetadata="false">
-    <testsuites>
-        <testsuite name="schema">
-            <directory>tests/schema/</directory>
-            <exclude>vendor/</exclude>
-        </testsuite>
-        <testsuite name="functional">
-            <directory>tests/functional/</directory>
-            <exclude>vendor/</exclude>
-        </testsuite>
-        <testsuite name="integration">
-            <directory>tests/integration/</directory>
-            <exclude>vendor/</exclude>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-    </coverage>
-    <php>
-        <ini name="allow_url_include" value="1" />
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" backupGlobals="true" colors="false" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" stopOnRisky="false" timeoutForSmallTests="1" timeoutForMediumTests="10" timeoutForLargeTests="60" cacheDirectory=".phpunit.cache" backupStaticProperties="false" requireCoverageMetadata="false">
+  <testsuites>
+    <testsuite name="schema">
+      <directory>tests/schema/</directory>
+      <exclude>vendor/</exclude>
+    </testsuite>
+    <testsuite name="functional">
+      <directory>tests/functional/</directory>
+      <exclude>vendor/</exclude>
+    </testsuite>
+    <testsuite name="integration">
+      <directory>tests/integration/</directory>
+      <exclude>vendor/</exclude>
+    </testsuite>
+  </testsuites>
+  <coverage/>
+  <php>
+    <ini name="allow_url_include" value="1"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>

src/Action/ConfigurationApplier.php

@@ -10,8 +10,8 @@
 
 final class ConfigurationApplier
 {
-    private ?Satellite\Action\Action $action = null;
+    private ?Action $action = null;
     private array $packages = [];
 
     public function __construct(
         private readonly string $plugin,
@@ -22,7 +22,7 @@
 
     public function withAction(): self
     {
-        $this->action = new Satellite\Action\Action($this->plugin, clone $this->interpreter);
+        $this->action = new Action($this->plugin, clone $this->interpreter);
 
         return $this;
     }
@@ -34,11 +34,11 @@
         return $this;
     }
 
     public function appendTo(array $config, Satellite\Builder\Repository\Action $action): void
     {
         $repository = $this->service->compile($config[$this->plugin]);
 
         ($this->action)($config, $action->getBuilder(), $repository);
 
         $action->addPackages(...$this->packages);
 

src/Action/Custom/Factory/Action.php

@@ -24,7 +24,7 @@
     private readonly Processor $processor;
     private readonly ConfigurationInterface $configuration;
 
     public function __construct(
         private readonly ExpressionLanguage $interpreter = new Satellite\ExpressionLanguage(),
         private readonly array $providers = [],
     ) {
@@ -63,7 +63,7 @@
     /**
      * @throws Configurator\ConfigurationExceptionInterface
      */
-    public function compile(array $config): Custom\Factory\Repository\Action
+    public function compile(array $config): Repository\Action
     {
         $containerName = sprintf('ProjectServiceContainer%s', ByteString::fromRandom(8)->toString());
 
@@ -74,14 +74,14 @@
 
         $container = (new SatelliteDependencyInjection(...$this->providers))($config);
 
-        $repository = new Custom\Factory\Repository\Action($builder);
+        $repository = new Repository\Action($builder);
 
         $dumper = new PhpDumper($container);
         $repository->addFiles(
             new Packaging\File(
                 sprintf('%s.php', $containerName),
                 new Packaging\Asset\InMemory(
                     $dumper->dump(['class' => $containerName, 'namespace' => 'GyroscopsGenerated'])
                 )
             ),
         );

src/Action/Custom/Service.php

@@ -4,7 +4,6 @@
 
 namespace Kiboko\Component\Satellite\Action\Custom;
 
-use Kiboko\Component\Satellite\Action\Custom;
 use Kiboko\Component\Satellite\ExpressionLanguage as Satellite;
 use Kiboko\Contract\Configurator;
 use Symfony\Component\Config\Definition\Exception as Symfony;
@@ -26,7 +25,7 @@
         private ExpressionLanguage $interpreter = new Satellite\ExpressionLanguage()
     ) {
         $this->processor = new Processor();
-        $this->configuration = new Custom\Configuration();
+        $this->configuration = new Configuration();
     }
 
     public function interpreter(): ExpressionLanguage
@@ -74,11 +73,11 @@
             && \count($config['expression_language'])
         ) {
             foreach ($config['expression_language'] as $provider) {
                 $interpreter->registerProvider(new $provider());
             }
         }
 
-        $actionFactory = new Custom\Factory\Action($this->interpreter);
+        $actionFactory = new Factory\Action($this->interpreter);
 
         return $actionFactory->compile($config);
     }

src/Adapter/Composer.php

@@ -167,7 +167,7 @@
     {
         $composer = json_decode(file_get_contents($this->workdir.'/composer.json'), true, 512, \JSON_THROW_ON_ERROR);
         foreach ($autoloads as $type => $autoload) {
             match ($type) {
                 'psr4' => $composer['autoload']['psr-4'] = $autoload,
                 'file' => $composer['autoload']['file'] = $autoload,
             };
@@ -219,4 +219,61 @@
             $token
         );
     }
+
+    public function addGitlabOauthAuthentication(string $token, string $url = 'gitlab.com'): void
+    {
+        $this->command(
+            'composer',
+            'config',
+            '--auth',
+            sprintf('gitlab-oauth.%s', $url),
+            'token',
+            $token
+        );
+    }
+
+    public function addGitlabTokenAuthentication(string $token, string $url = 'gitlab.com'): void
+    {
+        $this->command(
+            'composer',
+            'config',
+            '--auth',
+            sprintf('gitlab-token.%s', $url),
+            $token
+        );
+    }
+
+    public function addGithubOauthAuthentication(string $token, string $url = 'github.com'): void
+    {
+        $this->command(
+            'composer',
+            'config',
+            '--auth',
+            sprintf('github-oauth.%s', $url),
+            $token
+        );
+    }
+
+    public function addHttpBasicAuthentication(string $url, string $username, string $password): void
+    {
+        $this->command(
+            'composer',
+            'config',
+            '--auth',
+            sprintf('http-basic.%s', $url),
+            $username,
+            $password,
+        );
+    }
+
+    public function addHttpBearerAuthentication(string $url, string $token): void
+    {
+        $this->command(
+            'composer',
+            'config',
+            '--auth',
+            sprintf('bearer.%s', $url),
+            $token
+        );
+    }
 }

src/Adapter/ComposerFailureException.php

@@ -6,7 +6,7 @@
 
 final class ComposerFailureException extends \RuntimeException
 {
-    public function __construct(private readonly string $command = '', string $message = '', int $code = 0, \Throwable $previous = null)
+    public function __construct(private readonly string $command = '', string $message = '', int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

src/Adapter/Docker/Factory.php

@@ -76,7 +76,14 @@ public function __invoke(array $configuration): Configurator\SatelliteBuilderInt
 
             if (\array_key_exists('auth', $configuration['composer']) && (is_countable($configuration['composer']['auth']) ? \count($configuration['composer']['auth']) : 0) > 0) {
                 foreach ($configuration['composer']['auth'] as $auth) {
-                    $builder->withComposerAuthenticationToken($auth['url'], $auth['token']);
+                    match ($auth['type']) {
+                        'gitlab-oauth' => $builder->withGitlabOauthAuthentication($auth['token'], $auth['url'] ?? 'gitlab.com'),
+                        'gitlab-token' => $builder->withGitlabTokenAuthentication($auth['token'], $auth['url'] ?? 'gitlab.com'),
+                        'github-oauth' => $builder->withGithubOauthAuthentication($auth['token'], $auth['url'] ?? 'github.com'),
+                        'http-basic' => $builder->withHttpBasicAuthentication($auth['url'], $auth['username'], $auth['password']),
+                        'http-bearer' => $builder->withHttpBearerAuthentication($auth['url'], $auth['token']),
+                        default => throw new \LogicException(),
+                    };
                 }
             }
         }