[Core] Fix build

getparthenon · Jun 1, 2024 · d27b119 · d27b119
1 parent f2d141c
commit d27b119
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 103 deletions.
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
@@ -14,6 +14,7 @@ doctrine:
                 url: '%env(resolve:TIMESCALE_URL)%'
 
     orm:
+        default_entity_manager: default
         auto_generate_proxy_classes: true
         resolve_target_entities:
             Parthenon\User\Entity\UserInterface: App\Entity\User

diff --git a/src/Entity/ForgotPasswordCode.php b/src/Entity/ForgotPasswordCode.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="forgot_password_code")
- */
+#[ORM\Entity()]
+#[ORM\Table('forgot_password_code')]
 class ForgotPasswordCode extends \Parthenon\User\Entity\ForgotPasswordCode
 {
 }
diff --git a/src/Entity/InviteCode.php b/src/Entity/InviteCode.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="invite_codes")
- */
+#[ORM\Entity()]
+#[ORM\Table('invite_codes')]
 class InviteCode extends \Parthenon\User\Entity\InviteCode
 {
 }
diff --git a/src/Entity/Payment.php b/src/Entity/Payment.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="payment")
- */
+#[ORM\Entity()]
+#[ORM\Table('payment')]
 class Payment extends \Parthenon\Billing\Entity\Payment
 {
 }
diff --git a/src/Entity/Price.php b/src/Entity/Price.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="price")
- */
+#[ORM\Entity()]
+#[ORM\Table('price')]
 class Price extends \Parthenon\Billing\Entity\Price
 {
 }
diff --git a/src/Entity/Product.php b/src/Entity/Product.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="product")
- */
+#[ORM\Entity()]
+#[ORM\Table('product')]
 class Product extends \Parthenon\Billing\Entity\Product
 {
 }
diff --git a/src/Entity/Receipt.php b/src/Entity/Receipt.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="receipt")
- */
+#[ORM\Entity()]
+#[ORM\Table(name: 'receipt')]
 class Receipt extends \Parthenon\Billing\Entity\Receipt
 {
 }
diff --git a/src/Entity/ReceiptLine.php b/src/Entity/ReceiptLine.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="receipt_line")
- */
+#[ORM\Entity()]
+#[ORM\Table('receipt_line')]
 class ReceiptLine extends \Parthenon\Billing\Entity\ReceiptLine
 {
 }
diff --git a/src/Entity/Subscription.php b/src/Entity/Subscription.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="subscription")
- */
+#[ORM\Entity()]
+#[ORM\Table('subscription')]
 class Subscription extends \Parthenon\Billing\Entity\Subscription
 {
 }
diff --git a/src/Entity/SubscriptionPlan.php b/src/Entity/SubscriptionPlan.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="subscription_plan")
- */
+#[ORM\Entity()]
+#[ORM\Table('subscription_plan')]
 class SubscriptionPlan extends \Parthenon\Billing\Entity\SubscriptionPlan
 {
 }
diff --git a/src/Entity/Team.php b/src/Entity/Team.php
@@ -23,45 +23,28 @@
 
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Parthenon\Athena\Entity\CrudEntityInterface;
 use Parthenon\Billing\Entity\CustomerInterface;
 use Parthenon\Billing\Entity\EmbeddedSubscription;
 use Parthenon\Common\Address;
 use Parthenon\User\Entity\MemberInterface;
-use Parthenon\User\Entity\UserInterface;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="teams")
- */
-class Team extends \Parthenon\User\Entity\Team implements CustomerInterface, CrudEntityInterface
+#[ORM\Entity()]
+#[ORM\Table('teams')]
+class Team extends \Parthenon\User\Entity\Team implements CustomerInterface
 {
-    /**
-     * @ORM\OneToMany(targetEntity="App\Entity\User", mappedBy="team")
-     *
-     * @var UserInterface[]|Collection
-     */
+    #[ORM\OneToMany(targetEntity: User::class, mappedBy: 'teams')]
     protected Collection $members;
 
-    /**
-     * @ORM\Embedded(class="Parthenon\Common\Address")
-     */
+    #[ORM\Embedded(class: Address::class)]
     protected Address $billingAddress;
 
-    /**
-     * @ORM\Column(name="external_customer_reference", nullable=true)
-     */
+    #[ORM\Column(name: 'external_customer_reference', nullable: true)]
     protected ?string $externalCustomerReference;
 
-    /**
-     * @ORM\Column(name="payment_provider_details_url", nullable=true)
-     */
+    #[ORM\Column(name: 'payment_provider_details_url', nullable: true)]
     protected ?string $paymentProviderDetailsUrl;
 
-    /**
-     * @ORM\Embedded(class="Parthenon\Billing\Entity\EmbeddedSubscription")
-     */
+    #[ORM\Embedded(class: EmbeddedSubscription::class)]
     private ?EmbeddedSubscription $subscription;
 
     public function setSubscription(EmbeddedSubscription $subscription)

diff --git a/src/Entity/TeamInviteCode.php b/src/Entity/TeamInviteCode.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="team_invite_codes")
- */
+#[ORM\Entity()]
+#[ORM\Table('team_invite_codes')]
 class TeamInviteCode extends \Parthenon\User\Entity\TeamInviteCode
 {
 }
diff --git a/src/Entity/Tenant.php b/src/Entity/Tenant.php
@@ -23,11 +23,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="tenant")
- */
+#[ORM\Entity()]
+#[ORM\Table('tenant')]
 class Tenant extends \Parthenon\MultiTenancy\Entity\Tenant
 {
 }
diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -28,16 +28,11 @@
 use Parthenon\User\Entity\MemberInterface;
 use Parthenon\User\Entity\TeamInterface;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="users")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'users')]
 class User extends \Parthenon\User\Entity\User implements MemberInterface, LimitedUserInterface, BillingAdminInterface
 {
-    /**
-     * @ORM\ManyToOne(targetEntity="App\Entity\Team", fetch="EAGER")
-     */
+    #[ORM\ManyToOne(targetEntity: Team::class, fetch: 'EAGER')]
     private Team|SubscriberInterface $team;
 
     public function getTeam(): Team

diff --git a/src/MultiTenant/Entity/Link.php b/src/MultiTenant/Entity/Link.php
@@ -23,25 +23,16 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="links")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'links')]
 class Link
 {
-    /**
-     * @ORM\Id
-     *
-     * @ORM\Column(type="integer")
-     *
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
     private int $id;
 
-    /**
-     * @ORM\Column(type="string")
-     */
+    #[ORM\Column(type: 'string', length: 255)]
     private string $url;
 
     public function getId(): int