Merge pull request #4 from stefanpoensgen/feature/shopware-6.6

feat: shopware 6.6
stefanpoensgen · Apr 6, 2024 · 7e5d0b3 · 7e5d0b3
2 parents 20424ac + 2d95a61
commit 7e5d0b3
Show file tree

Hide file tree

Showing 37 changed files with 142 additions and 203 deletions.
diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml
@@ -9,6 +9,6 @@ jobs:
     uses: FriendsOfShopware/actions/.github/workflows/github.yml@main
     with:
       extensionName: ${{ github.event.repository.name }}
-      shopwareVersion: '6.5.0'
+      shopwareVersion: '6.6.0'
     secrets:
       ghToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Comments on the order",
     "type": "shopware-platform-plugin",
     "license": "MIT",
-    "version": "2.0.1",
+    "version": "3.0.0",
     "authors": [
         {
             "name": "Stefan Poensgen"
@@ -39,7 +39,7 @@
         }
     },
     "require": {
-        "shopware/core": "~6.5.0",
-        "shopware/administration": "~6.5.0"
+        "shopware/core": "~6.6.0",
+        "shopware/administration": "~6.6.0"
     }
 }
diff --git a/src/Core/Checkout/Order/Event/CheckoutOrderCommentCreatedEvent.php b/src/Core/Checkout/Order/Event/CheckoutOrderCommentCreatedEvent.php
@@ -29,8 +29,7 @@ public function __construct(
         private readonly OrderEntity $order,
         private readonly OrderCommentEntity $orderComment,
         private readonly Context $context
-    ) {
-    }
+    ) {}
 
     public function getName(): string
     {
@@ -54,6 +53,7 @@ public static function getAvailableData(): EventDataCollection
             ->add('orderComment', new EntityType(OrderCommentDefinition::class));
     }
 
+    #[\Override]
     public function getMailStruct(): MailRecipientStruct
     {
         if (!$this->order->getOrderCustomer() instanceof OrderCustomerEntity) {
@@ -65,6 +65,7 @@ public function getMailStruct(): MailRecipientStruct
         ]);
     }
 
+    #[\Override]
     public function getSalesChannelId(): string
     {
         return $this->order->getSalesChannelId();
@@ -75,11 +76,13 @@ public function getContext(): Context
         return $this->context;
     }
 
+    #[\Override]
     public function getOrderId(): string
     {
         return $this->getOrder()->getId();
     }
 
+    #[\Override]
     public function getCustomerId(): string
     {
         $customer = $this->getOrder()->getOrderCustomer();

diff --git a/src/Core/Checkout/Order/Event/CheckoutOrderCommentUpdatedEvent.php b/src/Core/Checkout/Order/Event/CheckoutOrderCommentUpdatedEvent.php
@@ -8,6 +8,7 @@ class CheckoutOrderCommentUpdatedEvent extends CheckoutOrderCommentCreatedEvent
 {
     public const EVENT_NAME = 'checkout.order.comment.updated';
 
+    #[\Override]
     public function getName(): string
     {
         return self::EVENT_NAME;

diff --git a/src/Core/Checkout/Order/Subscriber/BusinessEventCollectorSubscriber.php b/src/Core/Checkout/Order/Subscriber/BusinessEventCollectorSubscriber.php
@@ -11,12 +11,11 @@
 use SptecOrderComments\Core\Checkout\Order\Event\CheckoutOrderCommentUpdatedEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class BusinessEventCollectorSubscriber implements EventSubscriberInterface
+readonly class BusinessEventCollectorSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private readonly BusinessEventCollector $businessEventCollector)
-    {
-    }
+    public function __construct(private BusinessEventCollector $businessEventCollector) {}
 
+    #[\Override]
     public static function getSubscribedEvents(): array
     {
         return [

diff --git a/src/Extension/Checkout/Order/OrderComment/OrderCommentCollection.php b/src/Extension/Checkout/Order/OrderComment/OrderCommentCollection.php
@@ -11,6 +11,7 @@
  */
 class OrderCommentCollection extends EntityCollection
 {
+    #[\Override]
     protected function getExpectedClass(): string
     {
         return OrderCommentEntity::class;

diff --git a/src/Extension/Checkout/Order/OrderComment/OrderCommentDefinition.php b/src/Extension/Checkout/Order/OrderComment/OrderCommentDefinition.php
@@ -24,25 +24,29 @@
 
 class OrderCommentDefinition extends EntityDefinition
 {
-    final public const ENTITY_NAME = 'sptec_order_comment';
+    final public const string ENTITY_NAME = 'sptec_order_comment';
 
-    final public const EXTENSION_NAME = 'sptecOrderComments';
+    final public const string EXTENSION_NAME = 'sptecOrderComments';
 
+    #[\Override]
     public function getEntityName(): string
     {
         return self::ENTITY_NAME;
     }
 
+    #[\Override]
     public function getEntityClass(): string
     {
         return OrderCommentEntity::class;
     }
 
+    #[\Override]
     public function getCollectionClass(): string
     {
         return OrderCommentCollection::class;
     }
 
+    #[\Override]
     protected function defineFields(): FieldCollection
     {
         return new FieldCollection([

diff --git a/src/Extension/Checkout/Order/OrderComment/OrderCommentExtension.php b/src/Extension/Checkout/Order/OrderComment/OrderCommentExtension.php
@@ -13,6 +13,7 @@
 
 class OrderCommentExtension extends EntityExtension
 {
+    #[\Override]
     public function extendFields(FieldCollection $collection): void
     {
         $collection->add(
@@ -25,6 +26,7 @@ public function extendFields(FieldCollection $collection): void
         );
     }
 
+    #[\Override]
     public function getDefinitionClass(): string
     {
         return OrderDefinition::class;

diff --git a/src/Extension/Checkout/Order/OrderComment/OrderCommentMediaCollection.php b/src/Extension/Checkout/Order/OrderComment/OrderCommentMediaCollection.php
@@ -11,6 +11,7 @@
  */
 class OrderCommentMediaCollection extends EntityCollection
 {
+    #[\Override]
     protected function getExpectedClass(): string
     {
         return OrderCommentMediaEntity::class;

diff --git a/src/Extension/Checkout/Order/OrderComment/OrderCommentMediaDefinition.php b/src/Extension/Checkout/Order/OrderComment/OrderCommentMediaDefinition.php
@@ -18,28 +18,33 @@
 
 class OrderCommentMediaDefinition extends EntityDefinition
 {
-    final public const ENTITY_NAME = 'sptec_order_comment_media';
+    final public const string ENTITY_NAME = 'sptec_order_comment_media';
 
+    #[\Override]
     public function getEntityName(): string
     {
         return self::ENTITY_NAME;
     }
 
+    #[\Override]
     public function getCollectionClass(): string
     {
         return OrderCommentMediaCollection::class;
     }
 
+    #[\Override]
     public function getEntityClass(): string
     {
         return OrderCommentMediaEntity::class;
     }
 
+    #[\Override]
     protected function getParentDefinitionClass(): ?string
     {
         return OrderCommentDefinition::class;
     }
 
+    #[\Override]
     protected function defineFields(): FieldCollection
     {
         return new FieldCollection([

diff --git a/src/Extension/Content/Media/MediaExtension.php b/src/Extension/Content/Media/MediaExtension.php
@@ -13,6 +13,7 @@
 
 class MediaExtension extends EntityExtension
 {
+    #[\Override]
     public function extendFields(FieldCollection $collection): void
     {
         $collection->add(
@@ -24,6 +25,7 @@ public function extendFields(FieldCollection $collection): void
         );
     }
 
+    #[\Override]
     public function getDefinitionClass(): string
     {
         return MediaDefinition::class;

diff --git a/src/Extension/System/User/UserExtension.php b/src/Extension/System/User/UserExtension.php
@@ -12,6 +12,7 @@
 
 class UserExtension extends EntityExtension
 {
+    #[\Override]
     public function extendFields(FieldCollection $collection): void
     {
         $collection->add(
@@ -23,6 +24,7 @@ public function extendFields(FieldCollection $collection): void
         );
     }
 
+    #[\Override]
     public function getDefinitionClass(): string
     {
         return UserDefinition::class;

diff --git a/src/Migration/Migration1661526504.php b/src/Migration/Migration1661526504.php
@@ -9,11 +9,13 @@
 
 class Migration1661526504 extends MigrationStep
 {
+    #[\Override]
     public function getCreationTimestamp(): int
     {
         return 1661526504;
     }
 
+    #[\Override]
     public function update(Connection $connection): void
     {
         $query = <<<SQL
@@ -40,6 +42,7 @@ public function update(Connection $connection): void
         $connection->executeStatement($query);
     }
 
+    #[\Override]
     public function updateDestructive(Connection $connection): void
     {
         $connection->executeStatement('DROP TABLE `sptec_order_comment`');

diff --git a/src/Migration/Migration1663572635.php b/src/Migration/Migration1663572635.php
@@ -9,11 +9,13 @@
 
 class Migration1663572635 extends MigrationStep
 {
+    #[\Override]
     public function getCreationTimestamp(): int
     {
         return 1663572635;
     }
 
+    #[\Override]
     public function update(Connection $connection): void
     {
         $query = <<<SQL
@@ -37,7 +39,6 @@ public function update(Connection $connection): void
         $connection->executeStatement($query);
     }
 
-    public function updateDestructive(Connection $connection): void
-    {
-    }
+    #[\Override]
+    public function updateDestructive(Connection $connection): void {}
 }
diff --git a/src/Migration/Migration1663665465.php b/src/Migration/Migration1663665465.php
@@ -11,11 +11,13 @@
 
 class Migration1663665465 extends MigrationStep
 {
+    #[\Override]
     public function getCreationTimestamp(): int
     {
         return 1663665465;
     }
 
+    #[\Override]
     public function update(Connection $connection): void
     {
         $defaultFolderId = Uuid::randomBytes();
@@ -26,15 +28,14 @@ public function update(Connection $connection): void
         $this->addMediaFolder($connection, $defaultFolderId, $configurationId);
     }
 
-    public function updateDestructive(Connection $connection): void
-    {
-    }
+    #[\Override]
+    public function updateDestructive(Connection $connection): void {}
 
     private function addMediaDefaultFolder(Connection $connection, string $defaultFolderId): void
     {
         $query = <<<SQL
-            INSERT IGNORE INTO `media_default_folder` (`id`, `association_fields`, `entity`, `created_at`)
-            VALUES (:id, '["sptecOrderComment"]', 'sptec_order_comment', :createdAt);
+            INSERT IGNORE INTO `media_default_folder` (`id`, `entity`, `created_at`)
+            VALUES (:id, 'sptec_order_comment', :createdAt);
             SQL;
 
         $connection->executeStatement($query, [

diff --git a/src/Migration/Migration1665773845.php b/src/Migration/Migration1665773845.php
@@ -9,17 +9,18 @@
 
 class Migration1665773845 extends MigrationStep
 {
+    #[\Override]
     public function getCreationTimestamp(): int
     {
         return 1665773845;
     }
 
+    #[\Override]
     public function update(Connection $connection): void
     {
         $connection->executeStatement('ALTER TABLE `sptec_order_comment` ADD `task` TINYINT(1) NULL DEFAULT NULL;');
     }
 
-    public function updateDestructive(Connection $connection): void
-    {
-    }
+    #[\Override]
+    public function updateDestructive(Connection $connection): void {}
 }
diff --git a/src/Migration/Migration1683477576.php b/src/Migration/Migration1683477576.php
diff --git a/src/Resources/app/administration/src/app/component/filter/sw-boolean-filter/index.js b/src/Resources/app/administration/src/app/component/filter/sw-boolean-filter/index.js
diff --git a/...app/administration/src/app/component/filter/sw-boolean-filter/sw-boolean-filter.html.twig b/...app/administration/src/app/component/filter/sw-boolean-filter/sw-boolean-filter.html.twig
diff --git a/src/Resources/app/administration/src/app/component/sptec-media-item/index.js b/src/Resources/app/administration/src/app/component/sptec-media-item/index.js
@@ -1,9 +1,6 @@
 import template from './sptec-media-item.html.twig';
 import './sptec-media-item.scss';
 
-/**
- * @private
- */
 Shopware.Component.register('sptec-media-item', {
     template,