Merge pull request #95 from Shape-and-Shift/esd-4.0.0

Compatible with 6.7

Author: ChristopherDosin

.github/workflows/pr.yml

@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        shopware: [ '6.6.0.0' ]
+        shopware: [ '6.7.0.0-rc4' ]
     steps:
       - name: Clone Code
         uses: actions/checkout@v3
@@ -100,7 +100,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        shopware: [ '6.6.0.0' ]
+        shopware: [ '6.7.0.0-rc4' ]
     steps:
       - name: Clone Code
         uses: actions/checkout@v3

.phpstan.neon

@@ -1,9 +1,7 @@
 parameters:
     level: 8
     inferPrivatePropertyTypeFromConstructor: true
-    checkMissingIterableValueType: false
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
     paths:
         - ./src
     excludePaths:

CHANGELOG_de-DE.md

@@ -1,3 +1,6 @@
+# 4.0.0
+- Shopware 6.7 Kompatibilität
+
 # 3.0.2
 * Problem mit dem freien ESD-Element behoben.
 

CHANGELOG_en-GB.md

@@ -1,3 +1,6 @@
+# 4.0.0
+- Shopware 6.7 compatibility
+
 # 3.0.2
 * Fixed issue that regarding the free ESD item
 

composer.json

@@ -3,7 +3,7 @@
     "description":"ESD / Download plugin",
     "type":"shopware-platform-plugin",
     "keywords": ["esd", "download"],
-    "version":"3.0.2",
+    "version":"4.0.0",
     "license":"proprietary",
     "authors":[
         {
@@ -12,20 +12,21 @@
             "homepage":"https://shapeandshift.dev"
         }
     ],
+    "minimum-stability": "dev",
     "require": {
-        "shopware/core": "~6.6.0",
-        "shopware/storefront": "~6.6.0",
-        "shopware/administration": "~6.6.0"
+      "shopware/core": "~6.7.0",
+      "shopware/administration": "~6.7.0",
+      "shopware/storefront": "~6.7.0"
     },
     "require-dev":{
-        "phpunit/phpunit": "^10.4",
-        "phpstan/phpstan": "1.10.60",
-        "phpcompatibility/php-compatibility": "^9.3",
-        "squizlabs/php_codesniffer": "^3.6",
-        "infection/infection": "^0.28.0",
-        "kubawerlos/php-cs-fixer-custom-fixers": "^v3.21.0",
-        "symplify/easy-coding-standard": "^12.1.14",
-        "friendsofphp/php-cs-fixer": "^v3.52.1"
+      "phpunit/phpunit": "^10.4",
+      "phpstan/phpstan": "^1.11.10",
+      "phpcompatibility/php-compatibility": "^9.3",
+      "squizlabs/php_codesniffer": "^3.6",
+      "infection/infection": "^0.28.0",
+      "kubawerlos/php-cs-fixer-custom-fixers": "^v3.21.0",
+      "symplify/easy-coding-standard": "^12.1.14",
+      "friendsofphp/php-cs-fixer": "^v3.52.1"
     },
     "autoload":{
         "psr-4":{

src/Checkout/Cart/Subscriber/OrderPlacedSubscriber.php

@@ -14,7 +14,6 @@
 use Shopware\Core\Checkout\Cart\Event\CheckoutOrderPlacedEvent;
 use Shopware\Core\Checkout\Order\Aggregate\OrderLineItem\OrderLineItemEntity;
 use Shopware\Core\Content\Product\ProductCollection;
-use Shopware\Core\Content\Product\ProductEntity;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\System\SystemConfig\SystemConfigService;
@@ -23,6 +22,9 @@
 
 class OrderPlacedSubscriber implements EventSubscriberInterface
 {
+    /**
+     * @param EntityRepository<ProductCollection> $productRepository
+     */
     public function __construct(
         private readonly EntityRepository $productRepository,
         private readonly EsdOrderService $esdOrderService,
@@ -31,6 +33,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return array<string, string>
+     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -57,11 +62,9 @@ public function handle(CheckoutOrderPlacedEvent $event): void
         $criteria = new Criteria($productIds);
         $criteria->addAssociation('esd.esdMedia');
 
-        /** @var ProductCollection $products */
         $products = $this->productRepository->search($criteria, $event->getContext())->getEntities();
 
         $esdProducts = new ProductCollection();
-        /** @var ProductEntity $product */
         foreach ($products as $product) {
             $esd = $product->getExtension('esd');
             if (!$esd instanceof EsdEntity) {
@@ -89,7 +92,7 @@ public function handle(CheckoutOrderPlacedEvent $event): void
             $templateData = $this->esdOrderService->mailTemplateData($event->getOrder(), $event->getContext());
 
             if (!empty($templateData['esdOrderLineItems'])) {
-                if ($this->getSystemConfig(EsdMailTemplate::TEMPLATE_DOWNLOAD_DISABLED_ZIP_SYSTEM_CONFIG_NAME)) {
+                if ($this->getSystemConfig()) {
                     $event = new EsdDownloadPaymentStatusPaidDisabledZipEvent(
                         $event->getContext(),
                         $event->getOrder(),
@@ -109,9 +112,9 @@ public function handle(CheckoutOrderPlacedEvent $event): void
         }
     }
 
-    private function getSystemConfig(string $name): bool
+    private function getSystemConfig(): bool
     {
-        $config = $this->systemConfigService->get('SasEsd.config.' . $name);
+        $config = $this->systemConfigService->get('SasEsd.config.' . EsdMailTemplate::TEMPLATE_DOWNLOAD_DISABLED_ZIP_SYSTEM_CONFIG_NAME);
         if (empty($config)) {
             return false;
         }

src/Content/Product/Extension/Esd/Aggregate/EsdDownloadHistory/EsdDownloadHistoryEntity.php

@@ -3,6 +3,7 @@
 
 namespace Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdDownloadHistory;
 
+use Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdOrder\EsdOrderEntity;
 use Shopware\Core\Framework\DataAbstractionLayer\Entity;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityIdTrait;
 
@@ -12,6 +13,18 @@ class EsdDownloadHistoryEntity extends Entity
 
     protected ?string $esdOrderId = null;
 
+    protected ?EsdOrderEntity $esdOrder = null;
+
+    public function getEsdOrder(): ?EsdOrderEntity
+    {
+        return $this->esdOrder;
+    }
+
+    public function setEsdOrder(?EsdOrderEntity $esdOrder): void
+    {
+        $this->esdOrder = $esdOrder;
+    }
+
     public function getId(): string
     {
         return $this->id;

src/Content/Product/Extension/Esd/Aggregate/EsdMedia/EsdMediaEntity.php

@@ -3,6 +3,8 @@
 
 namespace Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdMedia;
 
+use Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdVideo\EsdVideoDefinition;
+use Sas\Esd\Content\Product\Extension\Esd\EsdDefinition;
 use Shopware\Core\Content\Media\MediaEntity;
 use Shopware\Core\Framework\DataAbstractionLayer\Entity;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityIdTrait;
@@ -17,6 +19,30 @@ class EsdMediaEntity extends Entity
 
     protected ?MediaEntity $media = null;
 
+    protected ?EsdDefinition $esd = null;
+
+    protected ?EsdVideoDefinition $esdVideo = null;
+
+    public function getEsd(): ?EsdDefinition
+    {
+        return $this->esd;
+    }
+
+    public function setEsd(?EsdDefinition $esd): void
+    {
+        $this->esd = $esd;
+    }
+
+    public function getEsdVideo(): ?EsdVideoDefinition
+    {
+        return $this->esdVideo;
+    }
+
+    public function setEsdVideo(?EsdVideoDefinition $esdVideo): void
+    {
+        $this->esdVideo = $esdVideo;
+    }
+
     protected ?int $downloadLimitNumber = null;
 
     public function getId(): string

src/Content/Product/Extension/Esd/Aggregate/EsdVideo/EsdVideoEntity.php

@@ -3,6 +3,7 @@
 
 namespace Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdVideo;
 
+use Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdMedia\EsdMediaEntity;
 use Shopware\Core\Framework\DataAbstractionLayer\Entity;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityIdTrait;
 
@@ -14,6 +15,18 @@ class EsdVideoEntity extends Entity
 
     protected int $option;
 
+    protected ?EsdMediaEntity $esdMedia = null;
+
+    public function getEsdMedia(): ?EsdMediaEntity
+    {
+        return $this->esdMedia;
+    }
+
+    public function setEsdMedia(?EsdMediaEntity $esdMedia): void
+    {
+        $this->esdMedia = $esdMedia;
+    }
+
     public function getEsdMediaId(): string
     {
         return $this->esdMediaId;

src/Content/Product/Extension/Esd/EsdEntity.php

@@ -4,6 +4,7 @@
 namespace Sas\Esd\Content\Product\Extension\Esd;
 
 use Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdMedia\EsdMediaCollection;
+use Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdOrder\EsdOrderCollection;
 use Sas\Esd\Content\Product\Extension\Esd\Aggregate\EsdSerial\EsdSerialCollection;
 use Shopware\Core\Content\Media\MediaEntity;
 use Shopware\Core\Content\Product\ProductEntity;
@@ -14,10 +15,7 @@ class EsdEntity extends Entity
 {
     use EntityIdTrait;
 
-    /**
-     * @var string
-     */
-    protected $id;
+    protected string $id;
 
     protected string $productId;
 
@@ -31,6 +29,30 @@ class EsdEntity extends Entity
 
     protected ?EsdMediaCollection $esdMedia = null;
 
+    protected ?EsdOrderCollection $orders = null;
+
+    protected string $productVersionId;
+
+    public function getOrders(): ?EsdOrderCollection
+    {
+        return $this->orders;
+    }
+
+    public function setOrders(?EsdOrderCollection $orders): void
+    {
+        $this->orders = $orders;
+    }
+
+    public function getProductVersionId(): string
+    {
+        return $this->productVersionId;
+    }
+
+    public function setProductVersionId(string $productVersionId): void
+    {
+        $this->productVersionId = $productVersionId;
+    }
+
     protected ?bool $hasCustomDownloadLimit = null;
 
     protected ?bool $hasUnlimitedDownload = null;
@@ -69,7 +91,7 @@ public function setProduct(?ProductEntity $product): void
         $this->product = $product;
     }
 
-    public function hasSerial(): bool
+    public function isHasSerial(): bool
     {
         return $this->hasSerial;
     }