adjust license

dachcom-digital · Nov 27, 2024 · 267e092 · 267e092
1 parent 7ea8904
commit 267e092
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 28 deletions.
diff --git a/src/Context/Resolver/SeoQueueResolver.php b/src/Context/Resolver/SeoQueueResolver.php
@@ -77,9 +77,6 @@ public function resolve(ConnectorDefinitionInterface $connectorDefinition, array
 
     protected function generateQueueEntry(Concrete $object, ConnectorContextItemInterface $contextItem): ?ResolvedItemInterface
     {
-        $type = 'unknown';
-        $dataUrl = null;
-
         $id = $object->getId();
         $dataUrl = $this->linkGeneratorService->generate($object, $contextItem);
 
@@ -91,12 +88,8 @@ protected function generateQueueEntry(Concrete $object, ConnectorContextItemInte
             return null;
         }
 
-        if (method_exists($object, 'getType')) {
-            $type = 'pimcore_' . $object->getType();
-        }
-
         return new ResolvedItem($contextItem, $object, [
-            'type'    => $type,
+            'type'    => sprintf('pimcore_%s', $object->getType()),
             'dataId'  => $id,
             'dataUrl' => $dataUrl
         ]);

diff --git a/src/CoreExtension/JobConnectorContext.php b/src/CoreExtension/JobConnectorContext.php
@@ -109,12 +109,7 @@ public function getDataFromEditmode(mixed $data, Concrete $object = null, array
             return null;
         }
 
-        if (!$object instanceof Concrete) {
-            return null;
-        }
-
         $items = [];
-
         foreach ($data as $connectorContext) {
             $connectorId = $connectorContext['connectorId'];
             $connectorName = $connectorContext['connectorName'];
@@ -235,10 +230,7 @@ protected function arrayCastRecursive(mixed $array): array
         return $array;
     }
 
-    /**
-     * @param Concrete $object
-     */
-    protected function markAsLoaded($object)
+    protected function markAsLoaded($object): void
     {
         if (!$object instanceof Concrete) {
             return;

diff --git a/src/DependencyInjection/Compiler/ContextItemsResolverPass.php b/src/DependencyInjection/Compiler/ContextItemsResolverPass.php
@@ -44,9 +44,11 @@ public function process(ContainerBuilder $container): void
             $itemsResolverConfig = $container->getParameter(sprintf('jobs.connectors.items_resolver.%s', $attributes['identifier']));
 
             $options = new OptionsResolver();
-            /** @var ContextItemsResolverInterface $class */
             $class = $itemsResolverDefinition->getClass();
-            $class::configureOptions($options);
+
+            if (is_string($class) && is_subclass_of($class, ContextItemsResolverInterface::class)) {
+                $class::configureOptions($options);
+            }
 
             try {
                 $resolvedOptions = $options->resolve($itemsResolverConfig);

diff --git a/src/Manager/ConnectorContextManager.php b/src/Manager/ConnectorContextManager.php
@@ -84,7 +84,6 @@ public function generateConnectorContextConfig(array $connectorContextItems): ar
         }
 
         $data = [
-            'context'             => [],
             'context_definitions' => $contextDefinitions
         ];
 
@@ -105,10 +104,6 @@ public function generateConnectorContextConfig(array $connectorContextItems): ar
 
         $data['connectors'] = $onlineConnectors;
 
-        if (!is_array($connectorContextItems)) {
-            return $data;
-        }
-
         foreach ($connectorContextItems as $connectorContextItem) {
             $context[] = [
                 'connector'           => [

diff --git a/src/Manager/ConnectorManager.php b/src/Manager/ConnectorManager.php
@@ -68,10 +68,6 @@ public function getConnectorDefinition(string $connectorDefinitionName, bool $lo
             return null;
         }
 
-        if (!$connectorDefinition instanceof ConnectorDefinitionInterface) {
-            return null;
-        }
-
         if ($loadEngine === true) {
             $connectorEngine = $this->connectorEngineRepository->findByName($connectorDefinitionName);
             $connectorDefinition->setConnectorEngine($connectorEngine);