Fixing the remaining namespaces and attributes

Brille24 · Apr 16, 2024 · e9463a7 · e9463a7
1 parent 8983bd2
commit e9463a7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 38 deletions.
diff --git a/src/Traits/OrderItemCustomerOptionCapableTrait.php b/src/Traits/OrderItemCustomerOptionCapableTrait.php
@@ -15,15 +15,14 @@
 trait OrderItemCustomerOptionCapableTrait
 {
     /**
-     * @var Collection|OrderItemOptionInterface[]
-     *
-     * @ORM\OneToMany(
-     *     targetEntity="Brille24\SyliusCustomerOptionsPlugin\Entity\OrderItemOptionInterface",
-     *     mappedBy="orderItem",
-     *     cascade={"persist", "remove"}
-     * )
+     * @var Collection<OrderItemOptionInterface>
      */
-    protected $configuration;
+     #[ORM\OneToMany(
+        targetEntity:OrderItemOptionInterface::class,
+         mappedBy:'orderItem',
+         cascade:['persist', 'remove']
+     )]
+    protected Collection $configuration;
 
     public function __construct()
     {

diff --git a/src/Traits/ProductCustomerOptionCapableTrait.php b/src/Traits/ProductCustomerOptionCapableTrait.php
@@ -14,29 +14,20 @@
 
 trait ProductCustomerOptionCapableTrait
 {
-    /**
-     * @var CustomerOptionGroupInterface|null
-     *
-     * @ORM\ManyToOne(
-     *     targetEntity="Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionGroupInterface",
-     *     inversedBy="products"
-     * )
-     *
-     * @ORM\JoinColumn(onDelete="SET NULL")
-     */
-    protected $customerOptionGroup;
+    #[ORM\ManyToOne(targetEntity: CustomerOptionGroupInterface::class, inversedBy: "products")]
+    #[ORM\JoinColumn(onDelete: "SET NULL")]
+    protected ?CustomerOptionGroupInterface $customerOptionGroup;
 
     /**
-     * @var Collection|CustomerOptionValuePriceInterface[]
-     *
-     * @ORM\OneToMany(
-     *     targetEntity="Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionValuePriceInterface",
-     *     mappedBy="product",
-     *     orphanRemoval=true,
-     *     cascade={"persist", "remove"}
-     * )
+     * @var Collection<CustomerOptionValuePriceInterface>
      */
-    protected $customerOptionValuePrices;
+    #[ORM\OneToMany(
+        targetEntity: CustomerOptionValuePriceInterface::class,
+        mappedBy: "product",
+        orphanRemoval: true,
+        cascade: ["persist", "remove"]
+    )]
+    protected Collection $customerOptionValuePrices;
 
     public function __construct()
     {

diff --git a/tests/PHPUnit/Entity/ConditionTest.php b/tests/PHPUnit/Entity/ConditionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Brille24\SyliusCustomerOptionsPlugin\PHPUnit\Entity\Tools;
+namespace Tests\Brille24\SyliusCustomerOptionsPlugin\PHPUnit\Entity;
 
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\Validator\Condition;

diff --git a/tests/PHPUnit/Factory/OrderItemOptionFactoryTest.php b/tests/PHPUnit/Factory/OrderItemOptionFactoryTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Brille24\SyliusCustomerOptionsPlugin\Factory;
+namespace Tests\Brille24\SyliusCustomerOptionsPlugin\PHPUnit\Factory;
 
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionValueInterface;

diff --git a/tests/PHPUnit/Service/CustomerOptionValueRefresherTest.php b/tests/PHPUnit/Service/CustomerOptionValueRefresherTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Brille24\SyliusCustomerOptionsPlugin\Service;
+namespace Tests\Brille24\SyliusCustomerOptionsPlugin\PHPUnit\Service;
 
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOption;
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionInterface;
@@ -22,7 +22,7 @@
 
 class CustomerOptionValueRefresherTest extends TestCase
 {
-    private \Brille24\SyliusCustomerOptionsPlugin\Services\CustomerOptionValueRefresher $customerOptionValueRefresher;
+    private CustomerOptionValueRefresher $customerOptionValueRefresher;
 
     private int $updateCount = 0;
 

diff --git a/tests/PHPUnit/Validator/CustomerOptionAssociationConstraintValidatorTest.php b/tests/PHPUnit/Validator/CustomerOptionAssociationConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Brille24\SyliusCustomerOptionsPlugin\Validator;
+namespace Tests\Brille24\SyliusCustomerOptionsPlugin\PHPUnit\Validator;
 
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionAssociationInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionInterface;
@@ -14,7 +14,7 @@
 
 class CustomerOptionAssociationConstraintValidatorTest extends TestCase
 {
-    private \Brille24\SyliusCustomerOptionsPlugin\Validator\CustomerOptionAssociationConstraintValidator $customerOptionAssociationConstraintValidator;
+    private CustomerOptionAssociationConstraintValidator $customerOptionAssociationConstraintValidator;
 
     private array $violations = [];
 

diff --git a/tests/PHPUnit/Validator/CustomerOptionConfigurationConstraintValidatorTest.php b/tests/PHPUnit/Validator/CustomerOptionConfigurationConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Brille24\SyliusCustomerOptionsPlugin\Validator;
+namespace Tests\Brille24\SyliusCustomerOptionsPlugin\PHPUnit\Validator;
 
 use Brille24\SyliusCustomerOptionsPlugin\Validator\Constraints\CustomerOptionConfigurationConstraint;
 use Brille24\SyliusCustomerOptionsPlugin\Validator\CustomerOptionConfigurationConstraintValidator;
@@ -14,7 +14,7 @@
 
 class CustomerOptionConfigurationConstraintValidatorTest extends TestCase
 {
-    private \Brille24\SyliusCustomerOptionsPlugin\Validator\CustomerOptionConfigurationConstraintValidator $customerOptionConfigurationValidator;
+    private CustomerOptionConfigurationConstraintValidator $customerOptionConfigurationValidator;
 
     private array $violations = [];
 

diff --git a/tests/PHPUnit/Validator/CustomerOptionValuePriceDateOverlapConstraintValidatorTest.php b/tests/PHPUnit/Validator/CustomerOptionValuePriceDateOverlapConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Brille24\SyliusCustomerOptionsPlugin\Validator;
+namespace Tests\Brille24\SyliusCustomerOptionsPlugin\PHPUnit\Validator;
 
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionInterface;
 use Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionValueInterface;
@@ -21,7 +21,7 @@
 
 class CustomerOptionValuePriceDateOverlapConstraintValidatorTest extends TestCase
 {
-    private \Brille24\SyliusCustomerOptionsPlugin\Validator\CustomerOptionValuePriceDateOverlapConstraintValidator $productCustomerOptionPriceValidator;
+    private CustomerOptionValuePriceDateOverlapConstraintValidator $productCustomerOptionPriceValidator;
 
     private array $violations = [];