Merge branch 'fetch-strategy-source'

Author: codedmonkey

config/reference.php

@@ -1649,7 +1649,8 @@
  *         dev_packages?: bool|Param, // Default: false
  *     },
  *     metadata?: array{
- *         mirror_vcs_repositories?: bool|Param, // Fetch mirrored packages from their VCS repositories by default when possible. // Default: false
+ *         default_fetch_strategy?: value-of<\CodedMonkey\Dirigent\Entity\PackageFetchStrategy>|\CodedMonkey\Dirigent\Entity\PackageFetchStrategy|Param, // Available values are "mirror" (default, fetch from the mirror), "source" (fetch from the VCS source) and "vcs" (fetch complete VCS repository) // Default: "mirror"
+ *         mirror_vcs_repositories?: bool|Param, // Deprecated: The node "mirror_vcs_repositories" at path "dirigent.metadata.mirror_vcs_repositories" is deprecated. Use the "default_fetch_strategy" option instead. // Fetch mirrored packages from their VCS repositories by default when possible. // Default: false
  *         retain_pruned_versions?: bool|array{
  *             enabled?: bool|Param, // Retain pruned package versions. // Default: true
  *             tagged_versions?: bool|Param, // Retain pruned tagged package versions. // Default: true

docs/configuration-reference.md

@@ -34,7 +34,7 @@ dirigent:
     preferred: true
     dev_packages: false
   metadata:
-    mirror_vcs_repositories: false
+    default_fetch_strategy: 'mirror'
     retain_pruned_versions:
       enabled: true
       tagged_versions: true
@@ -131,13 +131,22 @@ Whether to enable or disable distribution mirroring
 
 ## metadata
 
-### mirror_vcs_repositories
+### default_fetch_strategy
 
-Type: `boolean` | Default: `false`
+Type: `string` | Default: `mirror`
 
-Fetch mirrored packages from their VCS repositories by default when possible.
+Configure the default fetch strategy for new packages:
 
-Sets the fetch strategy of new mirrored packages to **Fetch from VCS**.
+**mirror** (Fetch from mirror)  
+Always try to mirror package metadata from mirror registries when possible. Only metadata from the project's
+`composer.json` is available. If mirroring is not possible, it defaults to `source` instead.  
+**source** (Fetch from source)  
+Fetch the package metadata directly from the source, but it doesn't have to include VCS data. For example, when the
+package is hosted on GitHub the API is used instead, which saves on storage and bandwidth but limits the amount of
+metadata that's available.  
+**vcs** (Fetch from VCS)  
+Fetch the package metadata directly from the source through VCS. Package metadata is created directly from the
+source code.
 
 ### retain_pruned_versions
 

migrations/Version20260713143513.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260713143513 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Convert the vcs package fetch strategy to source to preserve behavior of existing packages';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // Previously the vcs fetch strategy used the default Composer drivers (using APIs where
+        // possible), which is now the behavior of the source fetch strategy. The vcs fetch
+        // strategy now always clones repositories instead.
+        $this->addSql(<<<'SQL'
+            UPDATE package SET fetch_strategy = 'source' WHERE fetch_strategy = 'vcs'
+        SQL);
+        // Packages without a fetch strategy or mirror registry fell back to the vcs fetch strategy.
+        $this->addSql(<<<'SQL'
+            UPDATE package SET fetch_strategy = 'source' WHERE fetch_strategy IS NULL AND mirror_registry_id IS NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            UPDATE package SET fetch_strategy = 'vcs' WHERE fetch_strategy = 'source'
+        SQL);
+    }
+}

migrations/Version20260714131735.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260714131735 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Make the package fetch strategy required';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // Make the package fetch strategy required while preserving the previous default for existing packages
+        $this->addSql(<<<'SQL'
+            UPDATE package
+            SET fetch_strategy = CASE WHEN mirror_registry_id IS NULL THEN 'source' ELSE 'mirror' END
+            WHERE fetch_strategy IS NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE package ALTER fetch_strategy SET NOT NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE package ALTER fetch_strategy DROP NOT NULL
+        SQL);
+    }
+}

src/Composer/ComposerClient.php

@@ -11,6 +11,7 @@
 use Composer\IO\IOInterface;
 use Composer\IO\NullIO;
 use Composer\Repository\ComposerRepository;
+use Composer\Repository\Vcs as ComposerVcs;
 use Composer\Repository\VcsRepository;
 use Composer\Util\HttpDownloader;
 
@@ -41,7 +42,18 @@ public function createVcsRepository(Package $package, ?IOInterface $io = null, ?
         }
         $httpDownloader = $this->createHttpDownloader($io, $config);
 
-        return new VcsRepository(['url' => $repoUrl], $io, $config, $httpDownloader);
+        if ($package->getFetchStrategy()->isVcs()) {
+            $drivers = [
+                'git' => ComposerVcs\GitDriver::class,
+                'hg' => ComposerVcs\HgDriver::class,
+                'perforce' => ComposerVcs\PerforceDriver::class,
+                'fossil' => ComposerVcs\FossilDriver::class,
+                // svn must be last because identifying a subversion server for sure is practically impossible
+                'svn' => ComposerVcs\SvnDriver::class,
+            ];
+        }
+
+        return new VcsRepository(['url' => $repoUrl], $io, $config, $httpDownloader, drivers: $drivers ?? null);
     }
 
     public function createHttpDownloader(?IOInterface $io = null, ?Config $config = null): HttpDownloader

src/Controller/ApiController.php

@@ -43,8 +43,8 @@ public function __construct(
         private readonly MessageBusInterface $messenger,
         #[Autowire(param: 'dirigent.packages.dynamic_updates')]
         private readonly bool $dynamicUpdatesEnabled,
-        #[Autowire(param: 'dirigent.metadata.mirror_vcs_repositories')]
-        private readonly bool $mirrorVcsRepositories = false,
+        #[Autowire(param: 'dirigent.metadata.default_mirror_fetch_strategy')]
+        private readonly PackageFetchStrategy $defaultMirrorFetchStrategy,
     ) {
     }
 
@@ -184,10 +184,9 @@ private function findPackage(string $packageName, ?bool $create = false): ?Packa
                     return null;
                 }
 
-                $package = new Package();
-                $package->setName($packageName);
+                $package = new Package($packageName);
                 $package->setMirrorRegistry($registry);
-                $package->setFetchStrategy($this->mirrorVcsRepositories ? PackageFetchStrategy::Vcs : PackageFetchStrategy::Mirror);
+                $package->setFetchStrategy($this->defaultMirrorFetchStrategy);
 
                 $this->packageRepository->save($package, true);
             }

src/Controller/Dashboard/DashboardPackagesController.php

@@ -32,8 +32,8 @@ public function __construct(
         private readonly PackageRepository $packageRepository,
         private readonly PackageMetadataResolver $metadataResolver,
         private readonly MessageBusInterface $messenger,
-        #[Autowire(param: 'dirigent.metadata.mirror_vcs_repositories')]
-        private readonly bool $mirrorVcsRepositories = false,
+        #[Autowire(param: 'dirigent.metadata.default_mirror_fetch_strategy')]
+        private readonly PackageFetchStrategy $defaultMirrorFetchStrategy,
     ) {
     }
 
@@ -108,10 +108,9 @@ public function addMirroring(Request $request): Response
                     continue;
                 }
 
-                $package = new Package();
-                $package->setName($packageName);
+                $package = new Package($packageName);
                 $package->setMirrorRegistry($registry);
-                $package->setFetchStrategy($this->mirrorVcsRepositories ? PackageFetchStrategy::Vcs : PackageFetchStrategy::Mirror);
+                $package->setFetchStrategy($this->defaultMirrorFetchStrategy);
 
                 $this->packageRepository->save($package, true);
 
@@ -149,6 +148,7 @@ public function addVcsRepository(Request $request): Response
         if ($form->isSubmitted() && $form->isValid()) {
             /** @var Package $package */
             $package = $form->getData();
+
             $this->packageRepository->save($package, true);
 
             $this->messenger->dispatch(new UpdatePackage($package->getId(), PackageUpdateSource::Manual));

src/DependencyInjection/DirigentConfiguration.php

@@ -4,6 +4,7 @@
 
 namespace CodedMonkey\Dirigent\DependencyInjection;
 
+use CodedMonkey\Dirigent\Entity\PackageFetchStrategy;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -91,9 +92,19 @@ private function addMetadataSection(ArrayNodeDefinition|NodeDefinition $rootNode
             ->arrayNode('metadata')
                 ->addDefaultsIfNotSet()
                 ->children()
+                    ->enumNode('default_fetch_strategy')
+                        ->enumFqcn(PackageFetchStrategy::class)
+                        ->defaultValue(PackageFetchStrategy::Mirror)
+                        ->info('Available values are "mirror" (default, fetch from the mirror), "source" (fetch from the VCS source) and "vcs" (fetch complete VCS repository)')
+                    ->end()
                     ->booleanNode('mirror_vcs_repositories')
                         ->defaultFalse()
                         ->info('Fetch mirrored packages from their VCS repositories by default when possible.')
+                        ->setDeprecated(
+                            package: 'codedmonkey/dirigent',
+                            version: '0.8.0',
+                            message: 'The node "%node%" at path "%path%" is deprecated. Use the "default_fetch_strategy" option instead.',
+                        )
                     ->end()
                     ->arrayNode('retain_pruned_versions')
                         ->canBeDisabled('Retain pruned package versions.')

src/DependencyInjection/DirigentExtension.php

@@ -4,6 +4,7 @@
 
 namespace CodedMonkey\Dirigent\DependencyInjection;
 
+use CodedMonkey\Dirigent\Entity\PackageFetchStrategy;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension;
@@ -58,11 +59,25 @@ private function registerEncryptionConfiguration(array $config, ContainerBuilder
     }
 
     /**
-     * @param array{mirror_vcs_repositories: bool, retain_stale_revisions: array{enabled: bool, tagged_versions: bool, dev_versions: bool}, retain_pruned_versions: array{enabled: bool, tagged_versions: bool, dev_versions: bool}} $config
+     * @param array{default_fetch_strategy: PackageFetchStrategy, mirror_vcs_repositories: bool, retain_stale_revisions: array{enabled: bool, tagged_versions: bool, dev_versions: bool}, retain_pruned_versions: array{enabled: bool, tagged_versions: bool, dev_versions: bool}} $config
      */
     private function registerMetadataConfiguration(array $config, ContainerBuilder $container): void
     {
-        $container->setParameter('dirigent.metadata.mirror_vcs_repositories', $config['mirror_vcs_repositories']);
+        $defaultFetchStrategy = $config['default_fetch_strategy'];
+        $mirrorVcsRepositories = $config['mirror_vcs_repositories'];
+
+        if ($mirrorVcsRepositories && $defaultFetchStrategy->isMirror()) {
+            $defaultFetchStrategy = PackageFetchStrategy::Source;
+        }
+
+        $container->setParameter(
+            name: 'dirigent.metadata.default_mirror_fetch_strategy',
+            value: $defaultFetchStrategy,
+        );
+        $container->setParameter(
+            name: 'dirigent.metadata.default_vcs_fetch_strategy',
+            value: false === $defaultFetchStrategy->isMirror() ? $defaultFetchStrategy : PackageFetchStrategy::Source,
+        );
 
         $retainPrunedVersions = $config['retain_pruned_versions']['enabled'];
         $container->setParameter(

src/Doctrine/DataFixtures/PackageFixtures.php

@@ -20,9 +20,7 @@ public function __construct(
     public function load(ObjectManager $manager): void
     {
         foreach ($this->getPackages() as $packageData) {
-            $package = new Package();
-
-            $package->setName($packageData['name']);
+            $package = new Package($packageData['name']);
             $package->setRepositoryUrl($packageData['repositoryUrl']);
             $package->setFetchStrategy(PackageFetchStrategy::Vcs);