feat: 6.7 compability (#45)

---------

Co-authored-by: Oliver Skroblin <[email protected]>

Author: tinect

.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
           allowEol: false
           justMinMaxShopware: true
           allowShopwareNext: true
-          allowShopwareRC: false
+          allowShopwareRC: true
   test:
     env:
       PLUGIN_NAME: TinectRedirects

composer.json

@@ -9,8 +9,9 @@
         "name": "Tinect"
       }
     ],
+    "minimum-stability": "RC",
     "require": {
-        "shopware/core": "~6.6.0"
+        "shopware/core": "~6.6.0||~6.7.0"
     },
     "extra": {
         "shopware-plugin-class": "Tinect\\Redirects\\TinectRedirects",

src/Command/CleanupExcludesCommand.php

@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return Command::SUCCESS;
         }
 
-        if ($input->getOption('dry-run')) {
+        if ($input->getOption('dry-run') === true) {
             $output->writeln('Would delete ' . $countDeletes . ' entries');
         } else {
             $output->writeln('Deleting ' . $countDeletes . ' entries:');

src/Extension/SalesChannelDomainExtension.php

@@ -30,4 +30,9 @@ public function getDefinitionClass(): string
     {
         return SalesChannelDomainDefinition::class;
     }
+
+    public function getEntityName(): string
+    {
+        return 'sales_channel_domain';
+    }
 }

src/Migration/Migration1615031757ImportExportProfile.php

@@ -28,12 +28,15 @@ public function update(Connection $connection): void
             $profile['mapping']        = json_encode($profile['mapping'], \JSON_THROW_ON_ERROR);
             $profile['created_at']     = (new \DateTime())->format(Defaults::STORAGE_DATE_TIME_FORMAT);
 
+            $name = $profile['name'];
+            unset($profile['name']);
+
             $connection->insert('import_export_profile', $profile);
 
             $translation = [
                 'import_export_profile_id' => $profile['id'],
                 'language_id'              => Uuid::fromHexToBytes(Defaults::LANGUAGE_SYSTEM),
-                'label'                    => $profile['name'],
+                'label'                    => $name,
                 'created_at'               => (new \DateTime())->format(Defaults::STORAGE_DATE_TIME_FORMAT),
             ];
             $connection->insert('import_export_profile_translation', $translation);
@@ -58,6 +61,7 @@ private function getProfiles(): array
             [
                 'name'          => 'Default redirect',
                 'source_entity' => RedirectDefinition::ENTITY_NAME,
+                'technical_name' => 'default_' . RedirectDefinition::ENTITY_NAME,
                 'mapping'       => [
                     ['key' => 'id', 'mappedKey' => 'id'],
                     ['key' => 'httpCode', 'mappedKey' => 'http_code'],

src/Migration/Migration1720360485AddExcludes.php

@@ -22,7 +22,7 @@ public function update(Connection $connection): void
             ['configurationKey' => 'TinectRedirects.config.excludes']
         )->fetchAllAssociative();
 
-        if (empty($existingExcludes)) {
+        if ($existingExcludes === []) {
             return;
         }
 
@@ -33,7 +33,7 @@ public function update(Connection $connection): void
 
             $configurationValue = json_decode($existingExclude['configuration_value'], true, 512, JSON_THROW_ON_ERROR);
 
-            if (!\is_array($configurationValue) || !isset($configurationValue['_value'])) {
+            if (!\is_array($configurationValue) || !isset($configurationValue['_value']) || !\is_string($configurationValue['_value'])) {
                 continue;
             }
 

src/Migration/Migration1738788990ImportExportTechnicalName.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tinect\Redirects\Migration;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Core\Framework\Migration\MigrationStep;
+use Tinect\Redirects\Content\Redirect\RedirectDefinition;
+
+class Migration1738788990ImportExportTechnicalName extends MigrationStep
+{
+    public function getCreationTimestamp(): int
+    {
+        return 1738788990;
+    }
+
+    public function update(Connection $connection): void
+    {
+        $connection->executeStatement(
+            'UPDATE import_export_profile SET technical_name = :technicalName WHERE source_entity = :sourceEntity',
+            [
+                'technicalName' => 'default_' . RedirectDefinition::ENTITY_NAME,
+                'sourceEntity' => RedirectDefinition::ENTITY_NAME,
+            ]
+        );
+    }
+}

src/Subscriber/BeforeSendResponseSubscriber.php

@@ -133,7 +133,7 @@ private function handleRequest(Request $request): ?Response
 
         $targetURL = $this->seoUrlPlaceholderHandler->replace($targetURL, $host, $salesChannelContext);
 
-        if (!parse_url($targetURL, PHP_URL_SCHEME)) {
+        if (\in_array(\parse_url($targetURL, PHP_URL_SCHEME), [false, null], true)) {
             $targetURL = $host . $targetURL;
         }
 
@@ -156,7 +156,7 @@ private function getSalesChannelContext(Request $request): SalesChannelContext
 
         $languageId = $request->headers->get(PlatformRequest::HEADER_LANGUAGE_ID);
 
-        if (empty($languageId)) {
+        if ($languageId === null) {
             throw new \RuntimeException('No language id found in request.');
         }
 

src/Subscriber/isExcludedEventSubscriber.php

@@ -55,7 +55,7 @@ public function isBadUserAgent(IsExcludedEvent $event): void
 
         $badBotsRegex = '/' . $badUserAgents . '/i';
 
-        if (\preg_match($badBotsRegex, $userAgent)) {
+        if (\preg_match($badBotsRegex, $userAgent) !== false) {
             $event->setIsExcluded(true);
         }
     }
@@ -71,15 +71,17 @@ public function isExcluded(IsExcludedEvent $event): void
         $salesChannelId = $message->getSalesChannelId();
 
         if (!isset($this->excludes[$salesChannelId])) {
-            $excludes                        = \array_filter(\explode(PHP_EOL, $this->systemConfigService->getString('TinectRedirects.config.excludes', $salesChannelId)));
+            $excludes                        = \array_filter(
+                \explode(PHP_EOL, $this->systemConfigService->getString('TinectRedirects.config.excludes', $salesChannelId)),
+                static fn ($exclude) => $exclude !== '');
             $this->excludes[$salesChannelId] = $excludes;
         }
 
         $excludes = $this->excludes[$salesChannelId];
 
         foreach ($excludes as $exclude) {
             try {
-                if (\preg_match($exclude, $path)) {
+                if (\preg_match($exclude, $path) !== false) {
                     $event->setIsExcluded(true);
 
                     return;