update to work with pimcore 6

Author: Fabian Pechstein

composer.json

@@ -29,7 +29,7 @@
   ],
   "require": {
     "php": ">=7.0",
-    "pimcore/pimcore": ">=5.0"
+    "pimcore/pimcore": ">=6.0"
   },
   "autoload": {
     "psr-4": {

src/Xliff2Bundle/DependencyInjection/Compiler/Xliff20CompilerPass.php

@@ -29,7 +29,6 @@ public function process(ContainerBuilder $container)
         $definition = $container->getDefinition('Pimcore\Translation\ExportDataExtractorService\DataExtractor\DocumentDataExtractor');
         $definition->setClass('Xliff2Bundle\Translation\ExportDataExtractorService\DataExtractor\NotedDocumentDataExtractor');
 
-
         $definition = $container->getDefinition('Pimcore\Translation\ExportDataExtractorService\ExportDataExtractorServiceInterface');
         $definition->setClass('Xliff2Bundle\Translation\ExportDataExtractorService\NotedExportDataExtractorServiceInterface');
 

src/Xliff2Bundle/Resources/config/services.yml

@@ -0,0 +1,10 @@
+services:
+    # default configuration for services in *this* file
+    _defaults:
+        # automatically injects dependencies in your services
+        autowire: true
+        # automatically registers your services as commands, event subscribers, etc.
+        autoconfigure: true
+        # this means you cannot fetch services directly from the container via $container->get()
+        # if you need to do this, you can override this setting on individual services
+        public: false

src/Xliff2Bundle/Translation/AttributeSet/NotedAttributeSet.php

@@ -119,11 +119,12 @@ public function isEmpty(): bool
      * @param string $content
      * @param bool $isReadonly
      *
+     * @param array $targetContent
      * @return AttributeSet
      */
-    public function addAttribute(string $type, string $name, string $content, bool $isReadonly = false): AttributeSet
+    public function addAttribute(string $type, string $name, string $content, bool $isReadonly = false, array $targetContent = []): AttributeSet
     {
-        $this->set->addAttribute($type, $name, $content, $isReadonly);
+        $this->set->addAttribute($type, $name, $content, $isReadonly, $targetContent);
 
         return $this;
     }

src/Xliff2Bundle/Translation/Escaper/Xliff20Escaper.php

@@ -14,8 +14,6 @@
 
 class Xliff20Escaper
 {
-
-
     const SELFCLOSING_TAGS = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
     const CONTENT = "content";
     const ORIGINAL_DATA = "originalData";
@@ -167,4 +165,4 @@ public function setUpOriginalData($originalData)
             }
         }
     }
-}
+}

src/Xliff2Bundle/Translation/ExportService/Exporter/Xliff20Exporter.php

@@ -30,9 +30,9 @@ class Xliff20Exporter implements ExporterInterface
      */
     private $xliff20Escaper;
 
-    public function __construct(Xliff20Escaper $xliff20Escaper)
+    public function __construct()
     {
-        $this->xliff20Escaper = $xliff20Escaper;
+        $this->xliff20Escaper = new Xliff20Escaper();
     }
 
 
@@ -228,4 +228,4 @@ private function appendNotes(\SimpleXMLElement $unit, array $notes)
         }
 
     }
-}
+}