fix: fix namespace error when installing module (#246)

Resolves #242 Co-authored-by: Mariusz Sienkiewicz <mariusz.sienkiewicz.it@gmail.com>
myparcelnl · May 1, 2024 · cf3c9e4 · cf3c9e4
1 parent 9ed47ed
commit cf3c9e4
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 40 deletions.
diff --git a/src/Entity/AbstractEntity.php b/src/Entity/AbstractEntity.php
@@ -4,9 +4,7 @@
 
 namespace MyParcelNL\PrestaShop\Entity;
 
-use MyParcelNL\PrestaShop\Entity\Contract\EntityInterface;
-
 abstract class AbstractEntity implements EntityInterface
 {
-    public function __construct() {}
+    public function __construct() { }
 }
diff --git a/src/Entity/Contract/EntityInterface.php → src/Entity/EntityInterface.php b/src/Entity/Contract/EntityInterface.php → src/Entity/EntityInterface.php
@@ -2,10 +2,14 @@
 
 declare(strict_types=1);
 
-namespace MyParcelNL\PrestaShop\Entity\Contract;
+namespace MyParcelNL\PrestaShop\Entity;
 
 use MyParcelNL\Pdk\Base\Contract\Arrayable;
 
+/**
+ * @TODO Move to \MyParcelNL\PrestaShop\Entity\Contract namespace when possible.
+ * @see  https://github.com/myparcelnl/prestashop/issues/242
+ */
 interface EntityInterface extends Arrayable
 {
     public function __construct();

diff --git a/.../EntityWithCreatedTimestampsInterface.php → .../EntityWithCreatedTimestampsInterface.php b/.../EntityWithCreatedTimestampsInterface.php → .../EntityWithCreatedTimestampsInterface.php
@@ -2,10 +2,14 @@
 
 declare(strict_types=1);
 
-namespace MyParcelNL\PrestaShop\Entity\Contract;
+namespace MyParcelNL\PrestaShop\Entity;
 
 use DateTime;
 
+/**
+ * @TODO Move to \MyParcelNL\PrestaShop\Entity\Contract namespace when possible.
+ * @see  https://github.com/myparcelnl/prestashop/issues/242
+ */
 interface EntityWithCreatedTimestampsInterface extends EntityInterface
 {
     public function getDateAdd(): ?DateTime;

diff --git a/...ontract/EntityWithTimestampsInterface.php → src/Entity/EntityWithTimestampsInterface.php b/...ontract/EntityWithTimestampsInterface.php → src/Entity/EntityWithTimestampsInterface.php
@@ -2,10 +2,14 @@
 
 declare(strict_types=1);
 
-namespace MyParcelNL\PrestaShop\Entity\Contract;
+namespace MyParcelNL\PrestaShop\Entity;
 
 use DateTime;
 
+/**
+ * @TODO Move to \MyParcelNL\PrestaShop\Entity\Contract namespace when possible.
+ * @see  https://github.com/myparcelnl/prestashop/issues/242
+ */
 interface EntityWithTimestampsInterface extends EntityWithCreatedTimestampsInterface
 {
     public function getDateUpd(): ?DateTime;

diff --git a/src/Entity/Concern/HasCreatedTimestamps.php → src/Entity/HasCreatedTimestamps.php b/src/Entity/Concern/HasCreatedTimestamps.php → src/Entity/HasCreatedTimestamps.php
@@ -2,14 +2,15 @@
 
 declare(strict_types=1);
 
-namespace MyParcelNL\PrestaShop\Entity\Concern;
+namespace MyParcelNL\PrestaShop\Entity;
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithCreatedTimestampsInterface;
 
 /**
- * @see \MyParcelNL\PrestaShop\Entity\Contract\EntityWithCreatedTimestampsInterface
+ * @TODO Move to \MyParcelNL\PrestaShop\Entity\Concern namespace when possible.
+ * @see  https://github.com/myparcelnl/prestashop/issues/242
+ * @see  \MyParcelNL\PrestaShop\Entity\EntityWithCreatedTimestampsInterface
  */
 trait HasCreatedTimestamps
 {

diff --git a/src/Entity/Concern/HasJsonData.php → src/Entity/HasJsonData.php b/src/Entity/Concern/HasJsonData.php → src/Entity/HasJsonData.php
@@ -2,10 +2,14 @@
 
 declare(strict_types=1);
 
-namespace MyParcelNL\PrestaShop\Entity\Concern;
+namespace MyParcelNL\PrestaShop\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
+/**
+ * @TODO Move to \MyParcelNL\PrestaShop\Entity\Concern namespace when possible.
+ * @see  https://github.com/myparcelnl/prestashop/issues/242
+ */
 trait HasJsonData
 {
     /**

diff --git a/src/Entity/Concern/HasTimestamps.php → src/Entity/HasTimestamps.php b/src/Entity/Concern/HasTimestamps.php → src/Entity/HasTimestamps.php
@@ -2,15 +2,16 @@
 
 declare(strict_types=1);
 
-namespace MyParcelNL\PrestaShop\Entity\Concern;
+namespace MyParcelNL\PrestaShop\Entity;
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithTimestampsInterface;
 
 /**
- * @see \MyParcelNL\PrestaShop\Entity\Contract\EntityWithTimestampsInterface
- * @see \MyParcelNL\PrestaShop\Entity\Concern\HasCreatedTimestamps
+ * @TODO Move to \MyParcelNL\PrestaShop\Entity\Concern namespace when possible.
+ * @see  https://github.com/myparcelnl/prestashop/issues/242
+ * @see  \MyParcelNL\PrestaShop\Entity\EntityWithTimestampsInterface
+ * @see  \MyParcelNL\PrestaShop\Entity\HasCreatedTimestamps
  */
 trait HasTimestamps
 {

diff --git a/src/Entity/MyparcelnlAudit.php b/src/Entity/MyparcelnlAudit.php
@@ -6,9 +6,6 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use MyParcelNL\PrestaShop\Database\Table;
-use MyParcelNL\PrestaShop\Entity\Concern\HasCreatedTimestamps;
-use MyParcelNL\PrestaShop\Entity\Concern\HasJsonData;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithCreatedTimestampsInterface;
 
 /**
  * @ORM\Table

diff --git a/src/Entity/MyparcelnlCarrierMapping.php b/src/Entity/MyparcelnlCarrierMapping.php
@@ -6,8 +6,6 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use MyParcelNL\PrestaShop\Database\Table;
-use MyParcelNL\PrestaShop\Entity\Concern\HasTimestamps;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithTimestampsInterface;
 
 /**
  * @ORM\Table()

diff --git a/src/Entity/MyparcelnlCartDeliveryOptions.php b/src/Entity/MyparcelnlCartDeliveryOptions.php
@@ -6,9 +6,6 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use MyParcelNL\PrestaShop\Database\Table;
-use MyParcelNL\PrestaShop\Entity\Concern\HasJsonData;
-use MyParcelNL\PrestaShop\Entity\Concern\HasTimestamps;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithTimestampsInterface;
 
 /**
  * @ORM\Table

diff --git a/src/Entity/MyparcelnlOrderData.php b/src/Entity/MyparcelnlOrderData.php
@@ -6,9 +6,6 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use MyParcelNL\PrestaShop\Database\Table;
-use MyParcelNL\PrestaShop\Entity\Concern\HasJsonData;
-use MyParcelNL\PrestaShop\Entity\Concern\HasTimestamps;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithTimestampsInterface;
 
 /**
  * @ORM\Table

diff --git a/src/Entity/MyparcelnlOrderShipment.php b/src/Entity/MyparcelnlOrderShipment.php
@@ -6,9 +6,6 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use MyParcelNL\PrestaShop\Database\Table;
-use MyParcelNL\PrestaShop\Entity\Concern\HasJsonData;
-use MyParcelNL\PrestaShop\Entity\Concern\HasTimestamps;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithTimestampsInterface;
 
 /**
  * @ORM\Table

diff --git a/src/Entity/MyparcelnlProductSettings.php b/src/Entity/MyparcelnlProductSettings.php
@@ -6,9 +6,6 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use MyParcelNL\PrestaShop\Database\Table;
-use MyParcelNL\PrestaShop\Entity\Concern\HasJsonData;
-use MyParcelNL\PrestaShop\Entity\Concern\HasTimestamps;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithTimestampsInterface;
 
 /**
  * @ORM\Table

diff --git a/src/Repository/AbstractPsObjectRepository.php b/src/Repository/AbstractPsObjectRepository.php
@@ -9,13 +9,13 @@
 use MyParcelNL\Pdk\Base\Support\Utils;
 use MyParcelNL\Pdk\Facade\Pdk;
 use MyParcelNL\PrestaShop\Contract\PsObjectRepositoryInterface;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityInterface;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityWithTimestampsInterface;
+use MyParcelNL\PrestaShop\Entity\EntityInterface;
+use MyParcelNL\PrestaShop\Entity\EntityWithTimestampsInterface;
 use MyParcelNL\Sdk\src\Support\Str;
 use Throwable;
 
 /**
- * @template T of \MyParcelNL\PrestaShop\Entity\Contract\EntityInterface
+ * @template T of \MyParcelNL\PrestaShop\Entity\EntityInterface
  */
 abstract class AbstractPsObjectRepository implements PsObjectRepositoryInterface
 {
@@ -68,7 +68,7 @@ public function createEntity(): EntityInterface
     }
 
     /**
-     * @param  \MyParcelNL\PrestaShop\Entity\Contract\EntityInterface $entity
+     * @param  \MyParcelNL\PrestaShop\Entity\EntityInterface $entity
      *
      * @return void
      * @throws \Doctrine\ORM\Exception\ORMException

diff --git a/tests/Factory/AbstractPsEntityFactory.php b/tests/Factory/AbstractPsEntityFactory.php
@@ -10,7 +10,7 @@
 use MyParcelNL\Sdk\src\Support\Str;
 
 /**
- * @template T of \MyParcelNL\PrestaShop\Entity\Contract\EntityInterface
+ * @template T of \MyParcelNL\PrestaShop\Entity\EntityInterface
  * @implements PsObjectModelFactoryInterface<T>
  * @extends AbstractPsFactory<T>
  * @method $this withCreated(string $created)

diff --git a/tests/Factory/PsFactoryFactory.php b/tests/Factory/PsFactoryFactory.php
@@ -6,7 +6,7 @@
 
 use MyParcelNL\Pdk\Tests\Factory\Contract\FactoryInterface;
 use MyParcelNL\Pdk\Tests\Factory\Exception\InvalidFactoryException;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityInterface;
+use MyParcelNL\PrestaShop\Entity\EntityInterface;
 use ObjectModel;
 use Throwable;
 

diff --git a/tests/Mock/MockPsEntity.php b/tests/Mock/MockPsEntity.php
@@ -4,7 +4,7 @@
 
 namespace MyParcelNL\PrestaShop\Tests\Mock;
 
-use MyParcelNL\PrestaShop\Entity\Contract\EntityInterface;
+use MyParcelNL\PrestaShop\Entity\EntityInterface;
 
 abstract class MockPsEntity extends BaseMock implements EntityInterface
 {

diff --git a/tests/Mock/MockPsEntityRepository.php b/tests/Mock/MockPsEntityRepository.php
@@ -5,7 +5,7 @@
 namespace MyParcelNL\PrestaShop\Tests\Mock;
 
 use MyParcelNL\Pdk\Base\Support\Collection;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityInterface;
+use MyParcelNL\PrestaShop\Entity\EntityInterface;
 use MyParcelNL\Sdk\src\Support\Str;
 
 /**

diff --git a/tests/functions.php b/tests/functions.php
@@ -18,7 +18,7 @@
 use MyParcelNL\Pdk\Settings\Model\SettingsFactory;
 use MyParcelNL\Pdk\Tests\Bootstrap\TestBootstrapper;
 use MyParcelNL\Pdk\Tests\Factory\Collection\FactoryCollection;
-use MyParcelNL\PrestaShop\Entity\Contract\EntityInterface;
+use MyParcelNL\PrestaShop\Entity\EntityInterface;
 use MyParcelNL\PrestaShop\Entity\MyparcelnlCarrierMapping;
 use MyParcelNL\PrestaShop\Tests\Factory\PsFactoryFactory;
 use ObjectModel;