feat: shopware 6.7 (#114)

Author: stefanpoensgen

.github/workflows/code-style.yml

@@ -1,17 +1,36 @@
 name: Code Style
 on:
-    workflow_dispatch:
-    pull_request:
-    push:
-        branches:
-            - main
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
-    cs:
-        if: github.event_name != 'schedule'
-        uses: shopware/github-actions/.github/workflows/cs-fixer.yml@main
-    phpstan:
-        uses: shopware/github-actions/.github/workflows/phpstan.yml@main
+  cs:
+    if: github.event_name != 'schedule'
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run CS
+        uses: shopware/github-actions/extension-verifier@main
+        with:
+          action: format
+
+  check:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        version-selection: [ 'lowest', 'highest']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run Check
+        uses: shopware/github-actions/extension-verifier@main
         with:
-          extensionName: FroshTools
-          shopwareVersion: v6.6.0.0-rc1
+          action: check
+          check-against: ${{ matrix.version-selection }}

.gitignore

@@ -6,4 +6,8 @@ frosh-platform-mail-archive.js
 /vendor/
 /src/Resources/public/
 /composer.lock
-.php-cs-fixer.cache
+.php-cs-fixer.cache
+
+src/Resources/app/administration/src/.vite
+src/Resources/public
+

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "frosh/mail-platform-archive",
-    "version": "3.5.0",
+    "version": "3.5.1",
     "description": "Mail Archive",
     "type": "shopware-platform-plugin",
     "license": "MIT",
@@ -40,12 +40,16 @@
         }
     },
     "require": {
-        "shopware/core": "~6.6.0",
+        "shopware/core": "~6.6.0 || ~6.7.0",
         "zbateson/mail-mime-parser": "^2.4"
     },
     "config": {
         "allow-plugins": {
           "symfony/runtime": true
         }
+    },
+    "scripts": {
+        "format": "docker run --rm -v $(pwd):/ext shopware/shopware-cli:latest extension format /ext",
+        "check": "docker run --rm -v $(pwd):/ext shopware/shopware-cli:latest extension validate --full /ext"
     }
 }

phpstan.neon.dist

@@ -1,8 +1,5 @@
 parameters:
+    reportUnmatchedIgnoredErrors: false
     level: max
     paths:
         - src
-    type_coverage:
-        return_type: 100
-        param_type: 98
-        property_type: 100

qodana.yaml

@@ -13,7 +13,7 @@ class MailArchiveAttachmentEntity extends Entity
 
     protected string $mailArchiveId;
 
-    protected ?MailArchiveEntity $mailArchive;
+    protected ?MailArchiveEntity $mailArchive = null;
 
     protected string $fileName;
 

src/Content/MailArchive/MailArchiveAttachmentEntity.php

@@ -57,7 +57,7 @@ protected function defineFields(): FieldCollection
             (new StringField('subject', 'subject', 998))->addFlags(new Required())->addFlags(new SearchRanking(SearchRanking::HIGH_SEARCH_RANKING)),
             (new LongTextField('plainText', 'plainText'))->addFlags(new AllowHtml()),
             (new LongTextField('htmlText', 'htmlText'))->addFlags(new AllowHtml(), new SearchRanking(SearchRanking::LOW_SEARCH_RANKING)),
-            (new StringField('eml_path', 'emlPath', 2048)),
+            new StringField('eml_path', 'emlPath', 2048),
             (new StringField('transport_state', 'transportState'))->addFlags(new Required()),
 
             (new OneToManyAssociationField('attachments', MailArchiveAttachmentDefinition::class, 'mail_archive_id', 'id'))->addFlags(new CascadeDelete()),

src/Content/MailArchive/MailArchiveDefinition.php

@@ -16,55 +16,58 @@ class MailArchiveEntity extends Entity
 {
     use EntityIdTrait;
 
-    /** @var array<string, string> */
+    /**
+     * @var array<string, string>
+     */
     protected array $sender;
 
-    /** @var array<string, string> */
+    /**
+     * @var array<string, string>
+     */
     protected array $receiver;
 
     protected string $subject;
 
-    protected ?string $plainText;
+    protected ?string $plainText = null;
 
-    protected ?string $htmlText;
+    protected ?string $htmlText = null;
 
-    protected ?string $transportState;
+    protected ?string $transportState = null;
 
-    protected ?string $emlPath;
+    protected ?string $emlPath = null;
 
-    protected ?string $salesChannelId;
+    protected ?string $salesChannelId = null;
 
-    protected ?SalesChannelEntity $salesChannel;
+    protected ?SalesChannelEntity $salesChannel = null;
 
-    protected ?string $customerId;
+    protected ?string $customerId = null;
 
-    protected ?CustomerEntity $customer;
+    protected ?CustomerEntity $customer = null;
 
-    protected ?string $orderId;
+    protected ?string $orderId = null;
 
-    protected ?string $orderVersionId;
+    protected ?string $orderVersionId = null;
 
-    protected ?OrderEntity $order;
+    protected ?OrderEntity $order = null;
 
-    protected ?string $flowId;
+    protected ?string $flowId = null;
 
-    protected ?FlowEntity $flow;
+    protected ?FlowEntity $flow = null;
 
     /**
      * @var EntityCollection<MailArchiveAttachmentEntity>|null
      */
     protected ?EntityCollection $attachments = null;
 
-    protected ?string $sourceMailId;
+    protected ?string $sourceMailId = null;
 
-    protected ?MailArchiveEntity $sourceMail;
+    protected ?MailArchiveEntity $sourceMail = null;
 
     /**
      * @var EntityCollection<MailArchiveEntity>|null
      */
     protected ?EntityCollection $sourceMails = null;
 
-
     /**
      * @return array<string, string>
      */
@@ -288,5 +291,4 @@ public function setOrderVersionId(?string $orderVersionId): void
     {
         $this->orderVersionId = $orderVersionId;
     }
-
 }

src/Content/MailArchive/MailArchiveEntity.php

@@ -23,7 +23,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use ZBateson\MailMimeParser\Header\AddressHeader;
 use ZBateson\MailMimeParser\Header\DateHeader;
 use ZBateson\MailMimeParser\Header\IHeader;
@@ -37,13 +37,14 @@ class MailArchiveController extends AbstractController
      * @param EntityRepository<EntityCollection<MailArchiveAttachmentEntity>> $froshMailArchiveAttachmentRepository
      */
     public function __construct(
-        private readonly EntityRepository   $froshMailArchiveRepository,
-        private readonly EntityRepository   $froshMailArchiveAttachmentRepository,
+        private readonly EntityRepository $froshMailArchiveRepository,
+        private readonly EntityRepository $froshMailArchiveAttachmentRepository,
         #[Autowire(service: MailSender::class)]
         private readonly AbstractMailSender $mailSender,
-        private readonly RequestStack       $requestStack,
-        private readonly EmlFileManager     $emlFileManager,
-    ) {}
+        private readonly RequestStack $requestStack,
+        private readonly EmlFileManager $emlFileManager,
+    ) {
+    }
 
     #[Route(path: '/api/_action/frosh-mail-archive/resend-mail', name: 'api.action.frosh-mail-archive.resend-mail')]
     public function resend(Request $request, Context $context): JsonResponse
@@ -68,7 +69,7 @@ public function resend(Request $request, Context $context): JsonResponse
 
         $email = new Email();
         $emlPath = $mailArchive->getEmlPath();
-        $isEml = !empty($emlPath) && \is_string($emlPath);
+        $isEml = $emlPath !== '' && $emlPath !== '0' && \is_string($emlPath);
 
         if ($isEml) {
             $this->enrichFromEml($emlPath, $email);
@@ -110,7 +111,7 @@ public function download(Request $request, Context $context): JsonResponse
 
         $fileNameParts = [];
 
-        if ($mailArchive->getCreatedAt() !== null) {
+        if ($mailArchive->getCreatedAt() instanceof \DateTimeInterface) {
             $fileNameParts[] = $mailArchive->getCreatedAt()->format('Y-m-d_H-i-s');
         }
 
@@ -147,7 +148,7 @@ public function attachment(Request $request, Context $context): JsonResponse
         }
 
         $emlPath = $mailArchive->getEmlPath();
-        $isEml = !empty($emlPath) && \is_string($emlPath);
+        $isEml = $emlPath !== '' && $emlPath !== '0' && \is_string($emlPath);
 
         if (!$isEml) {
             throw new \RuntimeException('Cannot read eml file or file is empty');
@@ -175,7 +176,7 @@ public function attachment(Request $request, Context $context): JsonResponse
 
         $fileNameParts = [];
 
-        if ($mailArchive->getCreatedAt() !== null) {
+        if ($mailArchive->getCreatedAt() instanceof \DateTimeInterface) {
             $fileNameParts[] = $mailArchive->getCreatedAt()->format('Y-m-d_H-i-s');
         }
 
@@ -250,7 +251,7 @@ private function enrichFromDatabase(MailArchiveEntity $mailArchive, Email $email
     /**
      * @return string|array<string|Address>|\DateTimeImmutable|null
      */
-    private function getHeaderValue(IHeader $header): string|array|null|\DateTimeImmutable
+    private function getHeaderValue(IHeader $header): string|array|\DateTimeImmutable|null
     {
         if ($header instanceof AddressHeader) {
             /** @var AddressPart[] $addressParts */
@@ -286,7 +287,7 @@ private function getFileName(array $fileNameParts): string
 
     private function getContent(?string $emlPath): false|string
     {
-        if (empty($emlPath) || !\is_string($emlPath)) {
+        if ($emlPath === '' || $emlPath === '0' || !\is_string($emlPath)) {
             return false;
         }
 
@@ -299,7 +300,7 @@ private function getContent(?string $emlPath): false|string
     private function determineReturnPath(\DateTimeImmutable|array|string|null $headerValue): ?string
     {
         // Extract first item for return-path since Symfony/Mailer needs to be a string value here
-        if (is_array($headerValue)) {
+        if (\is_array($headerValue)) {
             $headerValue = array_pop($headerValue);
         }
 
@@ -309,15 +310,15 @@ private function determineReturnPath(\DateTimeImmutable|array|string|null $heade
             return $headerValue->getEncodedAddress();
         }
 
-        if (is_string($headerValue)) {
+        if (\is_string($headerValue)) {
             $regex = '/[<"]([^<>"\s]+@[^<>"\s]+)[>"]/';
             preg_match($regex, $headerValue, $matches);
             if (isset($matches[1])) {
                 $headerValue = $matches[1];
             }
         }
 
-        if (is_string($headerValue)) {
+        if (\is_string($headerValue)) {
             try {
                 return (new Address($headerValue))->getEncodedAddress();
             } catch (\Throwable) {

src/Controller/Api/MailArchiveController.php

@@ -26,6 +26,11 @@ public function extendFields(FieldCollection $collection): void
         );
     }
 
+    public function getEntityName(): string
+    {
+        return CustomerDefinition::ENTITY_NAME;
+    }
+
     public function getDefinitionClass(): string
     {
         return CustomerDefinition::class;