Use constant for 'datahub_context' instead hardcoded value (#880)

* Use constant for 'datahub_context' instead hardcoded value * Removed unused variable $context in DocumentTreeType. * Removed unused imports.
pimcore · Sep 27, 2024 · 90cca98 · 90cca98
1 parent 4d18220
commit 90cca98
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/src/Controller/WebserviceController.php b/src/Controller/WebserviceController.php
@@ -121,8 +121,8 @@ public function webonyxAction(
             PimcoreDataHubBundle::setNotAllowedPolicy($config['graphql']['not_allowed_policy']);
         }
 
-        $longRunningHelper->addPimcoreRuntimeCacheProtectedItems(['datahub_context']);
-        RuntimeCache::set('datahub_context', $context);
+        $longRunningHelper->addPimcoreRuntimeCacheProtectedItems([PimcoreDataHubBundle::RUNTIME_CONTEXT_KEY]);
+        RuntimeCache::set(PimcoreDataHubBundle::RUNTIME_CONTEXT_KEY, $context);
 
         ClassTypeDefinitions::build($service, $context);
 

diff --git a/src/GraphQL/ClassTypeDefinitions.php b/src/GraphQL/ClassTypeDefinitions.php
@@ -18,6 +18,7 @@
 use Pimcore\Bundle\DataHubBundle\Configuration;
 use Pimcore\Bundle\DataHubBundle\GraphQL\DataObjectType\PimcoreObjectType;
 use Pimcore\Bundle\DataHubBundle\GraphQL\Exception\ClientSafeException;
+use Pimcore\Bundle\DataHubBundle\PimcoreDataHubBundle;
 use Pimcore\Cache\RuntimeCache;
 use Pimcore\Db;
 use Pimcore\Model\DataObject\ClassDefinition;
@@ -81,7 +82,7 @@ public static function get($class)
     public static function getAll($onlyQueryTypes = false)
     {
         if ($onlyQueryTypes) {
-            $context = RuntimeCache::get('datahub_context');
+            $context = RuntimeCache::get(PimcoreDataHubBundle::RUNTIME_CONTEXT_KEY);
             /** @var Configuration $configuration */
             $configuration = $context['configuration'];
             $types = array_keys($configuration->getConfiguration()['schema']['queryEntities']);

diff --git a/src/GraphQL/DataObjectType/ObjectTreeType.php b/src/GraphQL/DataObjectType/ObjectTreeType.php
@@ -22,6 +22,7 @@
 use Pimcore\Bundle\DataHubBundle\GraphQL\ClassTypeDefinitions;
 use Pimcore\Bundle\DataHubBundle\GraphQL\Service;
 use Pimcore\Bundle\DataHubBundle\GraphQL\Traits\ServiceTrait;
+use Pimcore\Bundle\DataHubBundle\PimcoreDataHubBundle;
 use Pimcore\Cache\RuntimeCache;
 use Pimcore\Model\DataObject;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -47,7 +48,7 @@ public function __construct(Service $graphQlService, $config = ['name' => 'objec
      */
     public function getTypes(): array
     {
-        $context = RuntimeCache::get('datahub_context');
+        $context = RuntimeCache::get(PimcoreDataHubBundle::RUNTIME_CONTEXT_KEY);
         /** @var Configuration $configuration */
         $configuration = $context['configuration'];
 

diff --git a/src/GraphQL/DocumentType/DocumentTreeType.php b/src/GraphQL/DocumentType/DocumentTreeType.php
@@ -20,7 +20,6 @@
 use GraphQL\Type\Definition\UnionType;
 use Pimcore\Bundle\DataHubBundle\GraphQL\Service;
 use Pimcore\Bundle\DataHubBundle\GraphQL\Traits\ServiceTrait;
-use Pimcore\Cache\RuntimeCache;
 use Pimcore\Model\Document;
 use Pimcore\Model\Element\ElementInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -50,8 +49,6 @@ public function __construct(Service $graphQlService, $config = ['name' => 'docum
      */
     public function getTypes(): array
     {
-        $context = RuntimeCache::get('datahub_context');
-
         $types = [];
 
         $supportedTypes = [

diff --git a/src/GraphQL/Service.php b/src/GraphQL/Service.php
@@ -1145,7 +1145,7 @@ public function extractData($data, $target, $args = [], $context = [], ResolveIn
      */
     public function querySchemaEnabled(string $type)
     {
-        $context = RuntimeCache::get('datahub_context');
+        $context = RuntimeCache::get(PimcoreDataHubBundle::RUNTIME_CONTEXT_KEY);
         /** @var Configuration $configuration */
         $configuration = $context['configuration'];
         if ($type === 'object') {

diff --git a/src/WorkspaceHelper.php b/src/WorkspaceHelper.php
@@ -222,7 +222,7 @@ public static function deleteConfiguration(Configuration $config)
      */
     public static function checkPermission($element, $type)
     {
-        $context = RuntimeCache::get('datahub_context');
+        $context = RuntimeCache::get(PimcoreDataHubBundle::RUNTIME_CONTEXT_KEY);
         /** @var Configuration $configuration */
         $configuration = $context['configuration'];