Merge branch 'enums'

Author: codedmonkey

src/Composer/ConfigFactory.php

@@ -5,8 +5,8 @@
 namespace CodedMonkey\Dirigent\Composer;
 
 use CodedMonkey\Dirigent\Doctrine\Entity\Credentials;
-use CodedMonkey\Dirigent\Doctrine\Entity\CredentialsType;
 use CodedMonkey\Dirigent\Doctrine\Entity\Registry;
+use CodedMonkey\Dirigent\Entity\CredentialsType;
 use Composer\Config;
 use Composer\Factory;
 

src/Controller/ApiController.php

@@ -7,9 +7,9 @@
 use CodedMonkey\Dirigent\Attribute\IsGrantedAccess;
 use CodedMonkey\Dirigent\Attribute\MapPackage;
 use CodedMonkey\Dirigent\Doctrine\Entity\Package;
-use CodedMonkey\Dirigent\Doctrine\Entity\PackageFetchStrategy;
 use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
 use CodedMonkey\Dirigent\Doctrine\Repository\VersionRepository;
+use CodedMonkey\Dirigent\Entity\PackageFetchStrategy;
 use CodedMonkey\Dirigent\Entity\PackageUpdateSource;
 use CodedMonkey\Dirigent\Message\TrackInstallations;
 use CodedMonkey\Dirigent\Message\UpdatePackage;

src/Controller/Dashboard/DashboardCredentialsController.php

@@ -5,7 +5,7 @@
 namespace CodedMonkey\Dirigent\Controller\Dashboard;
 
 use CodedMonkey\Dirigent\Doctrine\Entity\Credentials;
-use CodedMonkey\Dirigent\Doctrine\Entity\CredentialsType;
+use CodedMonkey\Dirigent\Entity\CredentialsType;
 use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminRoute;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
@@ -37,10 +37,8 @@ public function configureFields(string $pageName): iterable
         yield TextareaField::new('description')
             ->onlyOnForms();
         yield ChoiceField::new('type')
-            ->setTemplatePath('dashboard/fields/credentials_type.html.twig')
             ->setRequired(true)
             ->setChoices(CredentialsType::cases())
-            ->setFormTypeOption('choice_label', static fn (CredentialsType $choice): string => "credentials.type.{$choice->value}")
             ->renderExpanded();
         yield TextField::new('username')
             ->setFormTypeOption('row_attr', ['data-credentials-field' => 'username'])

src/Controller/Dashboard/DashboardPackagesController.php

@@ -7,9 +7,9 @@
 use CodedMonkey\Dirigent\Attribute\IsGrantedAccess;
 use CodedMonkey\Dirigent\Attribute\MapPackage;
 use CodedMonkey\Dirigent\Doctrine\Entity\Package;
-use CodedMonkey\Dirigent\Doctrine\Entity\PackageFetchStrategy;
 use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
 use CodedMonkey\Dirigent\EasyAdmin\PackagePaginator;
+use CodedMonkey\Dirigent\Entity\PackageFetchStrategy;
 use CodedMonkey\Dirigent\Entity\PackageUpdateSource;
 use CodedMonkey\Dirigent\Form\PackageAddMirroringFormType;
 use CodedMonkey\Dirigent\Form\PackageAddVcsFormType;

src/Controller/Dashboard/DashboardRegistryController.php

@@ -5,9 +5,9 @@
 namespace CodedMonkey\Dirigent\Controller\Dashboard;
 
 use CodedMonkey\Dirigent\Doctrine\Entity\Registry;
-use CodedMonkey\Dirigent\Doctrine\Entity\RegistryPackageMirroring;
 use CodedMonkey\Dirigent\Doctrine\Repository\RegistryRepository;
 use CodedMonkey\Dirigent\EasyAdmin\DateIntervalField;
+use CodedMonkey\Dirigent\Entity\RegistryPackageMirroring;
 use EasyCorp\Bundle\EasyAdminBundle\Attribute\AdminRoute;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
@@ -71,10 +71,8 @@ public function configureFields(string $pageName): iterable
 
         yield ChoiceField::new('packageMirroring')
             ->setSortable(false)
-            ->setTemplatePath('dashboard/fields/registry_package_mirroring.html.twig')
             ->setRequired(true)
             ->setChoices(RegistryPackageMirroring::cases())
-            ->setFormTypeOption('choice_label', static fn (RegistryPackageMirroring $choice): string => "registry.package-mirroring.{$choice->value}")
             ->renderExpanded();
 
         yield DateIntervalField::new('dynamicUpdateDelay')

src/Doctrine/DataFixtures/AppFixtures.php

@@ -5,8 +5,8 @@
 namespace CodedMonkey\Dirigent\Doctrine\DataFixtures;
 
 use CodedMonkey\Dirigent\Doctrine\Entity\Registry;
-use CodedMonkey\Dirigent\Doctrine\Entity\RegistryPackageMirroring;
 use CodedMonkey\Dirigent\Doctrine\Entity\User;
+use CodedMonkey\Dirigent\Entity\RegistryPackageMirroring;
 use CodedMonkey\Dirigent\Entity\UserRole;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;

src/Doctrine/DataFixtures/PackageFixtures.php

@@ -5,7 +5,7 @@
 namespace CodedMonkey\Dirigent\Doctrine\DataFixtures;
 
 use CodedMonkey\Dirigent\Doctrine\Entity\Package;
-use CodedMonkey\Dirigent\Doctrine\Entity\PackageFetchStrategy;
+use CodedMonkey\Dirigent\Entity\PackageFetchStrategy;
 use CodedMonkey\Dirigent\Package\PackageMetadataResolver;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;

src/Doctrine/Entity/Credentials.php

@@ -6,6 +6,7 @@
 
 use CodedMonkey\Dirigent\Doctrine\Repository\CredentialsRepository;
 use CodedMonkey\Dirigent\Doctrine\Type\EncryptedTextType;
+use CodedMonkey\Dirigent\Entity\CredentialsType;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
@@ -25,7 +26,7 @@ class Credentials implements \Stringable
     private ?string $description = null;
 
     #[ORM\Column(type: Types::STRING, enumType: CredentialsType::class)]
-    private CredentialsType|string $type = CredentialsType::HttpBasic;
+    private CredentialsType $type = CredentialsType::HttpBasic;
 
     #[ORM\Column(type: EncryptedTextType::TYPE, nullable: true)]
     private ?string $username = null;
@@ -56,12 +57,12 @@ public function setDescription(?string $description): void
         $this->description = $description;
     }
 
-    public function getType(): CredentialsType|string
+    public function getType(): CredentialsType
     {
         return $this->type;
     }
 
-    public function setType(CredentialsType|string $type): void
+    public function setType(CredentialsType $type): void
     {
         $this->type = $type;
     }

src/Doctrine/Entity/CredentialsType.php

@@ -5,6 +5,7 @@
 namespace CodedMonkey\Dirigent\Doctrine\Entity;
 
 use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
+use CodedMonkey\Dirigent\Entity\PackageFetchStrategy;
 use CodedMonkey\Dirigent\Package\PackageMetadataResolver;
 use CodedMonkey\Dirigent\Validator\UniquePackage;
 use Composer\Package\Version\VersionParser;
@@ -65,7 +66,7 @@ class Package extends TrackedEntity
     private ?string $remoteId = null;
 
     #[ORM\Column(nullable: true, enumType: PackageFetchStrategy::class)]
-    private PackageFetchStrategy|string|null $fetchStrategy = null;
+    private ?PackageFetchStrategy $fetchStrategy = null;
 
     #[ORM\ManyToOne]
     private ?Registry $mirrorRegistry = null;
@@ -233,7 +234,7 @@ public function setRemoteId(?string $remoteId): void
         $this->remoteId = $remoteId;
     }
 
-    public function getFetchStrategy(): PackageFetchStrategy|string
+    public function getFetchStrategy(): PackageFetchStrategy
     {
         if (!$this->fetchStrategy) {
             return $this->mirrorRegistry ? PackageFetchStrategy::Mirror : PackageFetchStrategy::Vcs;
@@ -242,7 +243,7 @@ public function getFetchStrategy(): PackageFetchStrategy|string
         return $this->fetchStrategy;
     }
 
-    public function setFetchStrategy(PackageFetchStrategy|string $fetchStrategy): void
+    public function setFetchStrategy(PackageFetchStrategy $fetchStrategy): void
     {
         $this->fetchStrategy = $fetchStrategy;
     }