feat: Upgrade Plugin to work with shopware 6.7

composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "shopware/core": ">=6.6.10.4 <6.7.0.0",
+        "shopware/core": "^6.7",
         "php": "^8.3"
     },
     "extra": {

src/Core/Framework/Api/OAuth/AccessTokenRepository.php

@@ -48,8 +48,8 @@ public function revokeAccessToken($tokenId): void
         $this->decorated->revokeAccessToken($tokenId);
     }
 
-    public function isAccessTokenRevoked($tokenId): void
+    public function isAccessTokenRevoked($tokenId): bool
     {
-        $this->decorated->isAccessTokenRevoked($tokenId);
+        return $this->decorated->isAccessTokenRevoked($tokenId);
     }
 }

src/Core/Framework/Api/OAuth/NeosScopeEntity.php

@@ -15,7 +15,7 @@ class NeosScopeEntity implements ScopeEntityInterface
     /**
      * @return string
      */
-    public function getIdentifier()
+    public function getIdentifier(): string
     {
         return self::IDENTIFIER;
     }

src/Extension/Definition/Content/Cms/CmsPageDefinitionExtension.php

@@ -24,4 +24,9 @@ public function getDefinitionClass(): string
     {
         return CmsPageDefinition::class;
     }
+
+    public function getEntityName(): string
+    {
+        return CmsPageDefinition::ENTITY_NAME;
+    }
 }

src/Resources/config/config.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/shopware/core/System/SystemConfig/Schema/config.xsd">
+        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware/platform/master/src/Core/System/SystemConfig/Schema/config.xsd">
+
     <card>
         <title>CMS connection Settings</title>
         <title lang="de-DE">CMS Verbindungs-Einstellungen</title>
+
         <input-field type="url">
             <name>neosBaseUri</name>
             <required>true</required>

src/Resources/views/storefront/layout/meta.html.twig

@@ -31,7 +31,6 @@
             'frontend.menu.offcanvas': '{{ url('frontend.menu.offcanvas') }}',
             'frontend.cms.page': '{{ url('frontend.cms.page') }}',
             'frontend.cms.navigation.page': '{{ url('frontend.cms.navigation.page') }}',
-            'frontend.account.addressbook': '{{ url('frontend.account.addressbook') }}',
             'frontend.country.country-data': '{{ url('frontend.country.country.data') }}',
             'frontend.app-system.generate-token': '{{ url('frontend.app-system.generate-token', { name: 'Placeholder' }) }}',
         };

src/Service/NeosLayoutPageService.php

@@ -9,7 +9,6 @@
 use netlogixNeosContent\Core\Content\NeosNode\NeosNodeEntity;
 use netlogixNeosContent\Error\CanNotDeleteDefaultLayoutPageException;
 use Psr\Http\Client\ClientInterface;
-use Shopware\Administration\Notification\NotificationService;
 use Shopware\Core\Defaults;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityCollection;
@@ -18,6 +17,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\MultiFilter;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
+use Shopware\Core\Framework\Notification\NotificationService;
 use Shopware\Core\Framework\Uuid\Uuid;
 use Shopware\Core\System\SystemConfig\SystemConfigService;
 use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;

src/Storefront/Controller/PreviewController.php

@@ -70,7 +70,6 @@ public function loadPreview(
         Request $request,
         SalesChannelContext $salesChannelContext
     ): Response {
-        Feature::setActive('cache_rework', true);
         $cmsPage = $this->getPage($cmsPageId, $salesChannelContext->getContext());
         $pageType = $cmsPage->getType();
 

src/Twig/ResourceHelper.php

@@ -23,7 +23,11 @@ public function __construct(
         } catch (\Exception $e) {
             return; // FIXME handle error, log it or flash Message, but without catching it it breaks shopware completely
         }
-        $this->resources = json_decode($response->getBody()->getContents(), true);
+        $decodedBody = json_decode($response->getBody()->getContents(), true);
+        if (!is_array($decodedBody) || !isset($decodedBody['css'])) {
+            return;
+        }
+        $this->resources = $decodedBody;
     }
 
     public function getFunctions()