pimcore 11 suport

src/SchemaBundle/DependencyInjection/Compiler/SchemaGeneratorAdapterPass.php → src/DependencyInjection/Compiler/SchemaGeneratorAdapterPass.php

@@ -13,9 +13,10 @@ final class SchemaGeneratorAdapterPass implements CompilerPassInterface
     public function process(ContainerBuilder $container): void
     {
         foreach ($container->findTaggedServiceIds('schema.generator', true) as $id => $tags) {
+
             $definition = $container->getDefinition(SchemaGeneratorRegistry::class);
 
-            if ($container->getParameter('schema.flag.schema_listener_removed') === true) {
+            if ($container->hasParameter('schema.third_party.seo.enabled') && $container->getParameter('schema.third_party.seo.enabled') === true) {
                 $message = sprintf(
                     'Cannot register schema generator "%s" because you have installed the SEO Bundle. If you want to add some fragment generator (via twig) use the "schema.fragment_generator" tag. Read more about it here: %s',
                     $id,

src/DependencyInjection/SchemaExtension.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace SchemaBundle\DependencyInjection;
+
+use SchemaBundle\EventListener\SchemaListener;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
+
+class SchemaExtension extends Extension implements PrependExtensionInterface
+{
+    public function load(array $configs, ContainerBuilder $container): void
+    {
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../../config']));
+        $loader->load('services.yaml');
+    }
+
+    public function prepend(ContainerBuilder $container)
+    {
+        if ($container->hasExtension('seo')) {
+            return;
+        }
+
+        $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../../config']));
+
+        $container->setParameter('schema.third_party.seo.enabled', true);
+
+        $loader->load('third_party/seo.yaml');
+
+        if ($container->hasDefinition(SchemaListener::class)) {
+            $container->removeDefinition(SchemaListener::class);
+        }
+    }
+}

src/SchemaBundle/EventListener/SchemaListener.php → src/EventListener/SchemaListener.php

@@ -11,22 +11,15 @@
 
 class SchemaListener implements EventSubscriberInterface
 {
-    protected SchemaRequestProcessorInterface $schemaRequestProcessor;
-    protected RequestHelper $requestHelper;
-    protected PimcoreContextResolver $pimcoreContextResolver;
-
     /**
      * This service is only available in standalone mode.
      * If you've installed the SEO Bundle, this class is not available!
      */
     public function __construct(
-        SchemaRequestProcessorInterface $schemaRequestProcessor,
-        RequestHelper $requestHelper,
-        PimcoreContextResolver $contextResolver
+        protected SchemaRequestProcessorInterface $schemaRequestProcessor,
+        protected RequestHelper $requestHelper,
+        protected PimcoreContextResolver $pimcoreContextResolver
     ) {
-        $this->schemaRequestProcessor = $schemaRequestProcessor;
-        $this->requestHelper = $requestHelper;
-        $this->pimcoreContextResolver = $contextResolver;
     }
 
     public static function getSubscribedEvents(): array

src/SchemaBundle/Processor/SchemaElementProcessor.php → src/Processor/SchemaElementProcessor.php

@@ -7,11 +7,8 @@
 
 class SchemaElementProcessor implements SchemaElementProcessorInterface
 {
-    protected SchemaGeneratorRegistryInterface $generatorRegistry;
-
-    public function __construct(SchemaGeneratorRegistryInterface $generatorRegistry)
+    public function __construct(protected SchemaGeneratorRegistryInterface $generatorRegistry)
     {
-        $this->generatorRegistry = $generatorRegistry;
     }
 
     public function process($element): string

src/SchemaBundle/Processor/SchemaRequestProcessor.php → src/Processor/SchemaRequestProcessor.php

@@ -10,15 +10,10 @@
 
 class SchemaRequestProcessor implements SchemaRequestProcessorInterface
 {
-    protected HeadMeta $headMeta;
-    protected SchemaGeneratorRegistryInterface $generatorRegistry;
-
     public function __construct(
-        HeadMeta $headMeta,
-        SchemaGeneratorRegistryInterface $generatorRegistry
+        protected HeadMeta $headMeta,
+        protected SchemaGeneratorRegistryInterface $generatorRegistry
     ) {
-        $this->headMeta = $headMeta;
-        $this->generatorRegistry = $generatorRegistry;
     }
 
     public function process(Request $request): void
@@ -38,10 +33,6 @@ public function process(Request $request): void
         $this->appendHeadMeta($graph, $schemaBlocks);
     }
 
-    /**
-     * @param Graph $graph
-     * @param array $schemaBlocks
-     */
     protected function appendHeadMeta(Graph $graph, array $schemaBlocks): void
     {
         $nodes = $graph->getNodes();

src/SchemaBundle/SchemaBundle.php → src/SchemaBundle.php

@@ -24,6 +24,11 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new SchemaGeneratorAdapterPass());
     }
 
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
+
     protected function getComposerPackageName(): string
     {
         return self::PACKAGE_NAME;

src/SchemaBundle/Tool/Install.php → src/Tool/Install.php

@@ -6,10 +6,5 @@
 
 class Install extends SettingsStoreAwareInstaller
 {
-    public function install()
-    {
-        // currently, nothing to do.
 
-        parent::install();
-    }
 }

src/SchemaBundle/Twig/Extension/JsonLdExtension.php → src/Twig/Extension/JsonLdExtension.php

@@ -8,11 +8,8 @@
 
 class JsonLdExtension extends AbstractExtension
 {
-    protected SchemaElementProcessorInterface $schemaElementProcessor;
-
-    public function __construct(SchemaElementProcessorInterface $schemaElementProcessor)
+    public function __construct(protected SchemaElementProcessorInterface $schemaElementProcessor)
     {
-        $this->schemaElementProcessor = $schemaElementProcessor;
     }
 
     public function getFilters(): array

tests/_etc/config/app/config.yaml

@@ -0,0 +1,56 @@
+imports:
+    - { resource: services.yaml }
+    - { resource: 'local/' }
+
+services:
+    App\Controller\DefaultController:
+        public: true
+        autowire: true
+        autoconfigure: true
+        calls:
+            - [setContainer, ['@service_container']]
+
+doctrine:
+    dbal:
+        connections:
+            default:
+                mapping_types:
+                    enum: string
+                    bit: boolean
+
+pimcore:
+    config_location:
+        image_thumbnails:
+            write_target:
+                type: 'settings-store'
+        video_thumbnails:
+            write_target:
+                type: 'settings-store'
+        document_types:
+            write_target:
+                type: 'settings-store'
+        predefined_properties:
+            write_target:
+                type: 'settings-store'
+        predefined_asset_metadata:
+            write_target:
+                type: 'settings-store'
+        perspectives:
+            write_target:
+                type: 'settings-store'
+        custom_views:
+            write_target:
+                type: 'settings-store'
+        object_custom_layouts:
+            write_target:
+                type: 'settings-store'
+
+framework:
+    profiler:
+        enabled: true
+        collect: false
+    # don't send real emails in functional tests
+    mailer:
+        transports:
+            main: 'null://null'
+            pimcore_newsletter: 'null://null'

tests/_etc/config/app/system.yml → tests/_etc/config/app/system_settings.yaml

@@ -36,12 +36,6 @@ pimcore:
     email:
         debug:
             email_addresses: opensource@dachcom.ch
-    services:
-        google:
-            client_id: ''
-            email: ''
-            simple_api_key: ''
-            browser_api_key: ''
     full_page_cache:
         exclude_cookie: ''
         enabled: false