From 84861e9df78d374e3f9e4c657cf71a44c90b9bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20P=C5=82askonka?= <jplaskonka@divante.pl>
Date: Sat, 28 Aug 2021 19:50:54 +0200
Subject: [PATCH] Fix for missing configuration tree root and incompatible
 Class in Pimcore 6.9

---
 composer.json                                  | 2 +-
 src/DependencyInjection/Configuration.php      | 3 ++-
 src/Document/Areabrick/WysiwygWithMetadata.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 87f62c8..087cb4b 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
   ],
   "require": {
     "php": ">=7.1",
-    "pimcore/pimcore": "^6 || ^10.0"
+    "pimcore/pimcore": "^6.9 || ^10.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.5",
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 2cd6088..b827463 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -18,7 +18,8 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('pimcore_devkit');
-
+        $treeBuilder->root('pimcore_devkit');
+        
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
         // more information on that topic.
diff --git a/src/Document/Areabrick/WysiwygWithMetadata.php b/src/Document/Areabrick/WysiwygWithMetadata.php
index 13f45f4..bc63249 100644
--- a/src/Document/Areabrick/WysiwygWithMetadata.php
+++ b/src/Document/Areabrick/WysiwygWithMetadata.php
@@ -6,7 +6,7 @@
 use PimcoreDevkitBundle\Service\Wysiwyg\WysiwygService;
 use Pimcore\Extension\Document\Areabrick\AbstractTemplateAreabrick;
 use Pimcore\Model\Asset;
-use Pimcore\Model\Document\Editable\Area\Info;
+use Pimcore\Model\Document\Tag\Area\Info;
 
 /**
  * Class WysiwygWithMetadata