matecat / xliff-parser

src/XliffReplacer/Xliff20.php

Spacing +68 added lines, -68 removed lines

@@ -20,7 +20,7 @@ 
     /**
      * @var bool
      */
-    protected bool $unitContainsMda = false;   // check if <unit> already contains a <mda:metadata> (forXliff v 2.*)
+    protected bool $unitContainsMda = false; // check if <unit> already contains a <mda:metadata> (forXliff v 2.*)
 
     /**
      * @var string
@@ -35,7 +35,7 @@ 
     /**
      * @var string
      */
-    protected string $namespace = "matecat";       // Custom namespace
+    protected string $namespace = "matecat"; // Custom namespace
 
     /**
      * @var array
@@ -51,23 +51,23 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagOpen( $parser, string $name, array $attr ) {
+    protected function tagOpen($parser, string $name, array $attr) {
 
-        $this->handleOpenUnit( $name, $attr );
+        $this->handleOpenUnit($name, $attr);
 
-        if ( 'mda:metadata' === $name ) {
+        if ('mda:metadata' === $name) {
             $this->unitContainsMda = true;
         }
 
-        $this->trySetAltTrans( $name );;
-        $this->checkSetInTarget( $name );
+        $this->trySetAltTrans($name); ;
+        $this->checkSetInTarget($name);
 
         // open buffer
-        $this->setInBuffer( $name );
+        $this->setInBuffer($name);
 
         // check if we are inside a <target>, obviously this happen only if there are targets inside the trans-unit
         // <target> must be stripped to be replaced, so this check avoids <target> reconstruction
-        if ( !$this->inTarget ) {
+        if (!$this->inTarget) {
 
             $tag = '';
 
@@ -89,48 +89,48 @@ 
             //
             // http://docs.oasis-open.org/xliff/xliff-core/v2.0/os/xliff-core-v2.0-os.html#unit
             //
-            if ( in_array( $name, [ 'notes', 'originalData', 'segment', 'ignorable' ] ) &&
+            if (in_array($name, ['notes', 'originalData', 'segment', 'ignorable']) &&
                     $this->unitContainsMda === false &&
-                    !empty( $this->transUnits[ $this->currentTransUnitId ] ) &&
+                    !empty($this->transUnits[$this->currentTransUnitId]) &&
                     !$this->hasWrittenCounts
             ) {
                 // we need to update counts here
                 $this->updateCounts();
                 $this->hasWrittenCounts = true;
-                $tag                    .= $this->getWordCountGroupForXliffV2();
+                $tag .= $this->getWordCountGroupForXliffV2();
                 $this->unitContainsMda  = true;
             }
 
             // construct tag
             $tag .= "<$name ";
 
-            foreach ( $attr as $k => $v ) {
+            foreach ($attr as $k => $v) {
                 //normal tag flux, put attributes in it but skip for translation state and set the right value for the attribute
-                if ( $k != 'state' ) {
+                if ($k != 'state') {
                     $tag .= "$k=\"$v\" ";
                 }
             }
 
             $seg = $this->getCurrentSegment();
 
-            if ( $name === $this->tuTagName && !empty( $seg ) && isset( $seg[ 'sid' ] ) ) {
+            if ($name === $this->tuTagName && !empty($seg) && isset($seg['sid'])) {
 
                 // add `matecat:segment-id` to xliff v.2*
-                if ( strpos( $tag, 'matecat:segment-id' ) === false ) {
-                    $tag .= "matecat:segment-id=\"{$seg[ 'sid' ]}\" ";
+                if (strpos($tag, 'matecat:segment-id') === false) {
+                    $tag .= "matecat:segment-id=\"{$seg['sid']}\" ";
                 }
 
             }
 
             // replace state for xliff v2
-            if ( 'segment' === $name ) { // add state to segment in Xliff v2
-                [ $stateProp, ] = StatusToStateAttribute::getState( $this->xliffVersion, $seg[ 'status' ] );
+            if ('segment' === $name) { // add state to segment in Xliff v2
+                [$stateProp, ] = StatusToStateAttribute::getState($this->xliffVersion, $seg['status']);
                 $tag .= $stateProp;
             }
 
-            $tag = $this->handleOpenXliffTag( $name, $attr, $tag );
+            $tag = $this->handleOpenXliffTag($name, $attr, $tag);
 
-            $this->checkForSelfClosedTagAndFlush( $parser, $tag );
+            $this->checkForSelfClosedTagAndFlush($parser, $tag);
 
         }
 
@@ -143,10 +143,10 @@ 
      *
      * @return string
      */
-    protected function handleOpenXliffTag( string $name, array $attr, string $tag ): string {
-        $tag = parent::handleOpenXliffTag( $name, $attr, $tag );
+    protected function handleOpenXliffTag(string $name, array $attr, string $tag): string {
+        $tag = parent::handleOpenXliffTag($name, $attr, $tag);
         // add oasis xliff 20 namespace
-        if ( $name === 'xliff' && !array_key_exists( 'xmlns:mda', $attr ) ) {
+        if ($name === 'xliff' && !array_key_exists('xmlns:mda', $attr)) {
             $tag .= 'xmlns:mda="urn:oasis:names:tc:xliff:metadata:2.0"';
         }
 
@@ -156,7 +156,7 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagClose( $parser, string $name ) {
+    protected function tagClose($parser, string $name) {
         $tag = '';
 
         /**
@@ -165,39 +165,39 @@ 
          *
          * self::tagOpen method
          */
-        if ( !$this->isEmpty ) {
+        if (!$this->isEmpty) {
 
             // write closing tag if is not a target
             // EXCLUDE the target nodes with currentTransUnitIsTranslatable = 'NO'
-            if ( !$this->inTarget and $this->currentTransUnitIsTranslatable !== 'no' ) {
+            if (!$this->inTarget and $this->currentTransUnitIsTranslatable !== 'no') {
                 $tag = "</$name>";
             }
 
-            if ( 'target' == $name && !$this->inAltTrans ) {
+            if ('target' == $name && !$this->inAltTrans) {
 
-                if ( isset( $this->transUnits[ $this->currentTransUnitId ] ) ) {
+                if (isset($this->transUnits[$this->currentTransUnitId])) {
 
                     $seg = $this->getCurrentSegment();
 
                     // update counts
-                    if ( !$this->hasWrittenCounts && !empty( $seg ) ) {
-                        $this->updateSegmentCounts( $seg );
+                    if (!$this->hasWrittenCounts && !empty($seg)) {
+                        $this->updateSegmentCounts($seg);
                     }
 
                     // delete translations so the prepareSegment
                     // will put source content in target tag
-                    if ( $this->sourceInTarget ) {
-                        $seg[ 'translation' ] = '';
+                    if ($this->sourceInTarget) {
+                        $seg['translation'] = '';
                         $this->resetCounts();
                     }
 
                     // append $translation
-                    $translation = $this->prepareTranslation( $seg );
+                    $translation = $this->prepareTranslation($seg);
 
                     //append translation
                     $tag = "<target>$translation</target>";
 
-                } elseif( !empty($this->CDATABuffer) and $this->currentTransUnitIsTranslatable === 'no' ) {
+                } elseif (!empty($this->CDATABuffer) and $this->currentTransUnitIsTranslatable === 'no') {
 
                     // These are target nodes with currentTransUnitIsTranslatable = 'NO'
                     $this->bufferIsActive = false;
@@ -208,22 +208,22 @@ 
                 // signal we are leaving a target
                 $this->targetWasWritten = true;
                 $this->inTarget         = false;
-                $this->postProcAndFlush( $this->outputFP, $tag, true );
+                $this->postProcAndFlush($this->outputFP, $tag, true);
 
-            } elseif ( in_array( $name, $this->nodesToBuffer ) ) { // we are closing a critical CDATA section
+            } elseif (in_array($name, $this->nodesToBuffer)) { // we are closing a critical CDATA section
 
                 $this->bufferIsActive = false;
 
                 // only for Xliff 2.*
                 // write here <mda:metaGroup> and <mda:meta> if already present in the <unit>
-                if ( 'mda:metadata' === $name && $this->unitContainsMda && !$this->hasWrittenCounts ) {
+                if ('mda:metadata' === $name && $this->unitContainsMda && !$this->hasWrittenCounts) {
 
                     // we need to update counts here
                     $this->updateCounts();
                     $this->hasWrittenCounts = true;
 
                     $tag = $this->CDATABuffer;
-                    $tag .= $this->getWordCountGroupForXliffV2( false );
+                    $tag .= $this->getWordCountGroupForXliffV2(false);
                     $tag .= "    </mda:metadata>";
 
                 } else {
@@ -233,19 +233,19 @@ 
                 $this->CDATABuffer = "";
 
                 //flush to the pointer
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
 
-            } elseif ( 'segment' === $name ) {
+            } elseif ('segment' === $name) {
 
                 // only for Xliff 2.*
                 // if segment has no <target> add it BEFORE </segment>
-                if ( !$this->targetWasWritten ) {
+                if (!$this->targetWasWritten) {
 
                     $seg = $this->getCurrentSegment();
 
-                    if ( isset( $seg[ 'translation' ] ) ) {
+                    if (isset($seg['translation'])) {
 
-                        $translation = $this->prepareTranslation( $seg );
+                        $translation = $this->prepareTranslation($seg);
                         // replace the tag
                         $tag = "<target>$translation</target>";
 
@@ -258,19 +258,19 @@ 
                 // update segmentPositionInTu
                 $this->segmentInUnitPosition++;
 
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
 
                 // we are leaving <segment>, reset $segmentHasTarget
                 $this->targetWasWritten = false;
 
-            } elseif ( $this->bufferIsActive ) { // this is a tag ( <g | <mrk ) inside a seg or seg-source tag
+            } elseif ($this->bufferIsActive) { // this is a tag ( <g | <mrk ) inside a seg or seg-source tag
                 $this->CDATABuffer .= "</$name>";
                 // Do NOT Flush
             } else { //generic tag closure do Nothing
                 // flush to pointer
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
             }
-        } elseif ( in_array( $name, $this->nodesToBuffer ) ) {
+        } elseif (in_array($name, $this->nodesToBuffer)) {
 
             $this->isEmpty        = false;
             $this->bufferIsActive = false;
@@ -278,7 +278,7 @@ 
             $this->CDATABuffer    = "";
 
             //flush to the pointer
-            $this->postProcAndFlush( $this->outputFP, $tag );
+            $this->postProcAndFlush($this->outputFP, $tag);
 
         } else {
             //ok, nothing to be done; reset flag for next coming tag
@@ -286,10 +286,10 @@ 
         }
 
         // try to signal that we are leaving a target
-        $this->tryUnsetAltTrans( $name );
+        $this->tryUnsetAltTrans($name);
 
         // check if we are leaving a <trans-unit> (xliff v1.*) or <unit> (xliff v2.*)
-        if ( $this->tuTagName === $name ) {
+        if ($this->tuTagName === $name) {
             $this->currentTransUnitIsTranslatable = null;
             $this->inTU                           = false;
             $this->unitContainsMda                = false;
@@ -305,8 +305,8 @@ 
     private function updateCounts() {
 
         $seg = $this->getCurrentSegment();
-        if ( !empty( $seg ) ) {
-            $this->updateSegmentCounts( $seg );
+        if (!empty($seg)) {
+            $this->updateSegmentCounts($seg);
         }
 
     }
@@ -316,30 +316,30 @@ 
      *
      * @return string
      */
-    private function getWordCountGroupForXliffV2( bool $withMetadataTag = true ): string {
+    private function getWordCountGroupForXliffV2(bool $withMetadataTag = true): string {
 
         $this->mdaGroupCounter++;
-        $segments_count_array = $this->counts[ 'segments_count_array' ];
+        $segments_count_array = $this->counts['segments_count_array'];
 
         $tag = '';
 
-        if ( $withMetadataTag === true ) {
+        if ($withMetadataTag === true) {
             $tag .= '<mda:metadata>';
         }
 
         $index = 0;
-        foreach ( $segments_count_array as $segments_count_item ) {
+        foreach ($segments_count_array as $segments_count_item) {
 
             $id = 'word_count_tu.' . $this->currentTransUnitId . '.' . $index;
             $index++;
 
             $tag .= "    <mda:metaGroup id=\"" . $id . "\" category=\"row_xml_attribute\">
-                                <mda:meta type=\"x-matecat-raw\">" . $segments_count_item[ 'raw_word_count' ] . "</mda:meta>
-                                <mda:meta type=\"x-matecat-weighted\">" . $segments_count_item[ 'eq_word_count' ] . "</mda:meta>
+                                <mda:meta type=\"x-matecat-raw\">" . $segments_count_item['raw_word_count'] . "</mda:meta>
+                                <mda:meta type=\"x-matecat-weighted\">" . $segments_count_item['eq_word_count'] . "</mda:meta>
                             </mda:metaGroup>";
         }
 
-        if ( $withMetadataTag === true ) {
+        if ($withMetadataTag === true) {
             $tag .= '</mda:metadata>';
         }
 
@@ -354,18 +354,18 @@ 
      *
      * @return string
      */
-    protected function prepareTranslation( array $seg ): string {
+    protected function prepareTranslation(array $seg): string {
 
-        $segment     = Strings::removeDangerousChars( $seg [ 'segment' ] );
-        $translation = Strings::removeDangerousChars( $seg [ 'translation' ] );
-        $dataRefMap  = ( isset( $seg[ 'data_ref_map' ] ) ) ? Strings::jsonToArray( $seg[ 'data_ref_map' ] ) : [];
+        $segment     = Strings::removeDangerousChars($seg ['segment']);
+        $translation = Strings::removeDangerousChars($seg ['translation']);
+        $dataRefMap  = (isset($seg['data_ref_map'])) ? Strings::jsonToArray($seg['data_ref_map']) : [];
 
-        if ( $seg [ 'translation' ] == '' ) {
+        if ($seg ['translation'] == '') {
             $translation = $segment;
         } else {
-            if ( $this->callback instanceof XliffReplacerCallbackInterface ) {
-                $error = ( !empty( $seg[ 'error' ] ) ) ? $seg[ 'error' ] : null;
-                if ( $this->callback->thereAreErrors( $seg[ 'sid' ], $segment, $translation, $dataRefMap, $error ) ) {
+            if ($this->callback instanceof XliffReplacerCallbackInterface) {
+                $error = (!empty($seg['error'])) ? $seg['error'] : null;
+                if ($this->callback->thereAreErrors($seg['sid'], $segment, $translation, $dataRefMap, $error)) {
                     $translation = '|||UNTRANSLATED_CONTENT_START|||' . $segment . '|||UNTRANSLATED_CONTENT_END|||';
                 }
             }

src/XliffReplacer/Xliff12.php

Spacing +63 added lines, -63 removed lines

@@ -36,34 +36,34 @@ 
     /**
      * @var string
      */
-    protected string $namespace = "mtc";       // Custom namespace
+    protected string $namespace = "mtc"; // Custom namespace
 
     /**
      * @inheritDoc
      */
-    protected function tagOpen( $parser, string $name, array $attr ) {
+    protected function tagOpen($parser, string $name, array $attr) {
 
-        $this->handleOpenUnit( $name, $attr );
+        $this->handleOpenUnit($name, $attr);
 
-        $this->trySetAltTrans( $name );;
-        $this->checkSetInTarget( $name );
+        $this->trySetAltTrans($name); ;
+        $this->checkSetInTarget($name);
 
         // open buffer
-        $this->setInBuffer( $name );
+        $this->setInBuffer($name);
 
         // check if we are inside a <target>, obviously this happen only if there are targets inside the trans-unit
         // <target> must be stripped to be replaced, so this check avoids <target> reconstruction
-        if ( !$this->inTarget ) {
+        if (!$this->inTarget) {
 
             $tag = '';
 
             // construct tag
             $tag .= "<$name ";
 
-            foreach ( $attr as $k => $v ) {
+            foreach ($attr as $k => $v) {
 
                 //if tag name is file, we must replace the target-language attribute
-                if ( $name === 'file' && $k === 'target-language' && !empty( $this->targetLang ) ) {
+                if ($name === 'file' && $k === 'target-language' && !empty($this->targetLang)) {
                     //replace Target language with job language provided from constructor
                     $tag .= "$k=\"$this->targetLang\" ";
                 } else {
@@ -74,20 +74,20 @@ 
 
             $seg = $this->getCurrentSegment();
 
-            if ( $name === $this->tuTagName && !empty( $seg ) && isset( $seg[ 'sid' ] ) ) {
+            if ($name === $this->tuTagName && !empty($seg) && isset($seg['sid'])) {
 
                 // add `help-id` to xliff v.1*
-                if ( strpos( $tag, 'help-id' ) === false ) {
-                    if ( !empty( $seg[ 'sid' ] ) ) {
-                        $tag .= "help-id=\"{$seg[ 'sid' ]}\" ";
+                if (strpos($tag, 'help-id') === false) {
+                    if (!empty($seg['sid'])) {
+                        $tag .= "help-id=\"{$seg['sid']}\" ";
                     }
                 }
 
             }
 
-            $tag = $this->handleOpenXliffTag( $name, $attr, $tag );
+            $tag = $this->handleOpenXliffTag($name, $attr, $tag);
 
-            $this->checkForSelfClosedTagAndFlush( $parser, $tag );
+            $this->checkForSelfClosedTagAndFlush($parser, $tag);
 
         }
 
@@ -97,7 +97,7 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagClose( $parser, string $name ) {
+    protected function tagClose($parser, string $name) {
         $tag = '';
 
         /**
@@ -106,23 +106,23 @@ 
          *
          * self::tagOpen method
          */
-        if ( !$this->isEmpty ) {
+        if (!$this->isEmpty) {
 
             // write closing tag if is not a target
             // EXCLUDE the target nodes with currentTransUnitIsTranslatable = 'NO'
-            if ( !$this->inTarget and $this->currentTransUnitIsTranslatable !== 'no' ) {
+            if (!$this->inTarget and $this->currentTransUnitIsTranslatable !== 'no') {
                 $tag = "</$name>";
             }
 
-            if ( 'target' == $name && !$this->inAltTrans ) {
+            if ('target' == $name && !$this->inAltTrans) {
 
-                if ( isset( $this->transUnits[ $this->currentTransUnitId ] ) ) {
+                if (isset($this->transUnits[$this->currentTransUnitId])) {
 
                     // get translation of current segment, by indirect indexing: id -> positional index -> segment
                     // actually there may be more than one segment to that ID if there are two mrk of the same source segment
                     $tag = $this->rebuildTarget();
 
-                } elseif( !empty($this->CDATABuffer) and $this->currentTransUnitIsTranslatable === 'no' ) {
+                } elseif (!empty($this->CDATABuffer) and $this->currentTransUnitIsTranslatable === 'no') {
 
                     // These are target nodes with currentTransUnitIsTranslatable = 'NO'
                     $this->bufferIsActive = false;
@@ -133,45 +133,45 @@ 
                 $this->targetWasWritten = true;
                 // signal we are leaving a target
                 $this->inTarget = false;
-                $this->postProcAndFlush( $this->outputFP, $tag, true );
+                $this->postProcAndFlush($this->outputFP, $tag, true);
 
-            } elseif ( in_array( $name, $this->nodesToBuffer ) ) { // we are closing a critical CDATA section
+            } elseif (in_array($name, $this->nodesToBuffer)) { // we are closing a critical CDATA section
 
                 $this->bufferIsActive = false;
                 $tag                  = $this->CDATABuffer . "</$name>";
                 $this->CDATABuffer    = "";
 
                 //flush to the pointer
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
 
-            } elseif ( $name === $this->tuTagName ) {
+            } elseif ($name === $this->tuTagName) {
 
                 $tag = "";
 
                 // handling </trans-unit> closure
-                if ( !$this->targetWasWritten ) {
+                if (!$this->targetWasWritten) {
 
-                    if ( isset( $this->transUnits[ $this->currentTransUnitId ] ) ) {
+                    if (isset($this->transUnits[$this->currentTransUnitId])) {
                         $tag = $this->rebuildTarget();
                     } else {
-                        $tag = $this->createTargetTag( "", "" );
+                        $tag = $this->createTargetTag("", "");
                     }
 
                 }
 
-                $tag                    .= "</$this->tuTagName>";
+                $tag .= "</$this->tuTagName>";
                 $this->targetWasWritten = false;
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
 
-            } elseif ( $this->bufferIsActive ) { // this is a tag ( <g | <mrk ) inside a seg or seg-source tag
+            } elseif ($this->bufferIsActive) { // this is a tag ( <g | <mrk ) inside a seg or seg-source tag
                 $this->CDATABuffer .= "</$name>";
                 // Do NOT Flush
             } else { //generic tag closure do Nothing
                 // flush to pointer
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
             }
 
-        } elseif ( in_array( $name, $this->nodesToBuffer ) ) {
+        } elseif (in_array($name, $this->nodesToBuffer)) {
 
             $this->isEmpty        = false;
             $this->bufferIsActive = false;
@@ -179,7 +179,7 @@ 
             $this->CDATABuffer    = "";
 
             //flush to the pointer
-            $this->postProcAndFlush( $this->outputFP, $tag );
+            $this->postProcAndFlush($this->outputFP, $tag);
 
         } else {
             //ok, nothing to be done; reset flag for next coming tag
@@ -187,10 +187,10 @@ 
         }
 
         // try to signal that we are leaving a target
-        $this->tryUnsetAltTrans( $name );
+        $this->tryUnsetAltTrans($name);
 
         // check if we are leaving a <trans-unit> (xliff v1.*) or <unit> (xliff v2.*)
-        if ( $this->tuTagName === $name ) {
+        if ($this->tuTagName === $name) {
             $this->currentTransUnitIsTranslatable = null;
             $this->inTU                           = false;
             $this->hasWrittenCounts               = false;
@@ -207,31 +207,31 @@ 
      *
      * @return string
      */
-    protected function prepareTranslation( array $seg, string $transUnitTranslation = "" ): string {
+    protected function prepareTranslation(array $seg, string $transUnitTranslation = ""): string {
 
-        $segment     = Strings::removeDangerousChars( $seg [ 'segment' ] );
-        $translation = Strings::removeDangerousChars( $seg [ 'translation' ] );
+        $segment     = Strings::removeDangerousChars($seg ['segment']);
+        $translation = Strings::removeDangerousChars($seg ['translation']);
 
-        if ( $seg [ 'translation' ] == '' ) {
+        if ($seg ['translation'] == '') {
             $translation = $segment;
         } else {
-            if ( $this->callback instanceof XliffReplacerCallbackInterface ) {
-                $error = ( !empty( $seg[ 'error' ] ) ) ? $seg[ 'error' ] : null;
-                if ( $this->callback->thereAreErrors( $seg[ 'sid' ], $segment, $translation, [], $error ) ) {
+            if ($this->callback instanceof XliffReplacerCallbackInterface) {
+                $error = (!empty($seg['error'])) ? $seg['error'] : null;
+                if ($this->callback->thereAreErrors($seg['sid'], $segment, $translation, [], $error)) {
                     $translation = '|||UNTRANSLATED_CONTENT_START|||' . $segment . '|||UNTRANSLATED_CONTENT_END|||';
                 }
             }
         }
 
-        $transUnitTranslation .= $seg[ 'prev_tags' ] . $this->rebuildMarks( $seg, $translation ) . ltrim( $seg[ 'succ_tags' ] );
+        $transUnitTranslation .= $seg['prev_tags'] . $this->rebuildMarks($seg, $translation) . ltrim($seg['succ_tags']);
 
         return $transUnitTranslation;
     }
 
-    protected function rebuildMarks( array $seg, string $translation ): string {
+    protected function rebuildMarks(array $seg, string $translation): string {
 
-        if ( $seg[ 'mrk_id' ] !== null && $seg[ 'mrk_id' ] != '' ) {
-            $translation = "<mrk mid=\"" . $seg[ 'mrk_id' ] . "\" mtype=\"seg\">" . $seg[ 'mrk_prev_tags' ] . $translation . $seg[ 'mrk_succ_tags' ] . "</mrk>";
+        if ($seg['mrk_id'] !== null && $seg['mrk_id'] != '') {
+            $translation = "<mrk mid=\"" . $seg['mrk_id'] . "\" mtype=\"seg\">" . $seg['mrk_prev_tags'] . $translation . $seg['mrk_succ_tags'] . "</mrk>";
         }
 
         return $translation;
@@ -246,10 +246,10 @@ 
      *
      * @return string
      */
-    protected function createTargetTag( string $translation, string $stateProp ): string {
+    protected function createTargetTag(string $translation, string $stateProp): string {
         $targetLang = ' xml:lang="' . $this->targetLang . '"';
         $tag        = "<target $targetLang $stateProp>$translation</target>";
-        $tag        .= "\n<count-group name=\"$this->currentTransUnitId\"><count count-type=\"x-matecat-raw\">" . $this->counts[ 'raw_word_count' ] . "</count><count count-type=\"x-matecat-weighted\">" . $this->counts[ 'eq_word_count' ] . '</count></count-group>';
+        $tag .= "\n<count-group name=\"$this->currentTransUnitId\"><count count-type=\"x-matecat-raw\">" . $this->counts['raw_word_count'] . "</count><count count-type=\"x-matecat-weighted\">" . $this->counts['eq_word_count'] . '</count></count-group>';
 
         return $tag;
 
@@ -265,7 +265,7 @@ 
         // we must reset the lastMrkId found because this is a new segment.
         $lastMrkId = -1;
 
-        foreach ( $this->lastTransUnit as $pos => $seg ) {
+        foreach ($this->lastTransUnit as $pos => $seg) {
 
             /*
              * This routine works to respect the positional orders of markers.
@@ -278,8 +278,8 @@ 
              * pre-assign zero to the new mrk if this is the first one ( in this segment )
              * If it is null leave it NULL
              */
-            if ( (int)$seg[ "mrk_id" ] < 0 && $seg[ "mrk_id" ] !== null ) {
-                $seg[ "mrk_id" ] = 0;
+            if ((int)$seg["mrk_id"] < 0 && $seg["mrk_id"] !== null) {
+                $seg["mrk_id"] = 0;
             }
 
             /*
@@ -288,39 +288,39 @@ 
              * ( null <= -1 ) === true
              * so, cast to int
              */
-            if ( (int)$seg[ "mrk_id" ] <= $lastMrkId ) {
+            if ((int)$seg["mrk_id"] <= $lastMrkId) {
                 break;
             }
 
             // update counts
-            if ( !empty( $seg ) ) {
-                $this->updateSegmentCounts( $seg );
+            if (!empty($seg)) {
+                $this->updateSegmentCounts($seg);
             }
 
             // delete translations so the prepareSegment
             // will put source content in target tag
-            if ( $this->sourceInTarget ) {
-                $seg[ 'translation' ] = '';
+            if ($this->sourceInTarget) {
+                $seg['translation'] = '';
                 $this->resetCounts();
             }
 
             // append $translation
-            $translation = $this->prepareTranslation( $seg, $translation );
+            $translation = $this->prepareTranslation($seg, $translation);
 
-            $lastMrkId = $seg[ "mrk_id" ];
+            $lastMrkId = $seg["mrk_id"];
 
-            [ $stateProp, $lastMrkState ] = StatusToStateAttribute::getState( $this->xliffVersion, $seg[ 'status' ], $lastMrkState );
+            [$stateProp, $lastMrkState] = StatusToStateAttribute::getState($this->xliffVersion, $seg['status'], $lastMrkState);
 
         }
 
         //append translation
-        return $this->createTargetTag( $translation, $stateProp );
+        return $this->createTargetTag($translation, $stateProp);
 
     }
 
     protected function getCurrentSegment(): array {
-        if ( $this->currentTransUnitIsTranslatable !== 'no' && isset( $this->transUnits[ $this->currentTransUnitId ] ) ) {
-            return $this->segments[ $this->transUnits[ $this->currentTransUnitId ][ 0 ] ]; // TODO try to understand why here is needed to override the method and set 0 index hardcoded
+        if ($this->currentTransUnitIsTranslatable !== 'no' && isset($this->transUnits[$this->currentTransUnitId])) {
+            return $this->segments[$this->transUnits[$this->currentTransUnitId][0]]; // TODO try to understand why here is needed to override the method and set 0 index hardcoded
         }
 
         return [];

src/XliffParser/XliffParserV2.php

Spacing +136 added lines, -136 removed lines

@@ -16,30 +16,30 @@ 
      * @inheritDoc
      * @throws Exception
      */
-    public function parse( DOMDocument $dom, ?array $output = [] ): array {
+    public function parse(DOMDocument $dom, ?array $output = []): array {
         $i = 1;
         /** @var DOMElement $file */
-        foreach ( $dom->getElementsByTagName( 'file' ) as $file ) {
+        foreach ($dom->getElementsByTagName('file') as $file) {
 
             // metadata
-            $output[ 'files' ][ $i ][ 'attr' ] = $this->extractMetadata( $dom );
+            $output['files'][$i]['attr'] = $this->extractMetadata($dom);
 
             // notes
-            $output[ 'files' ][ $i ][ 'notes' ] = $this->extractNotes( $file );
+            $output['files'][$i]['notes'] = $this->extractNotes($file);
 
             // trans-units
             $transUnitIdArrayForUniquenessCheck = [];
             $j                                  = 1;
             /** @var DOMElement $transUnit */
-            foreach ( $file->childNodes as $childNode ) {
-                $this->extractTuFromNode( $childNode, $transUnitIdArrayForUniquenessCheck, $dom, $output, $i, $j );
+            foreach ($file->childNodes as $childNode) {
+                $this->extractTuFromNode($childNode, $transUnitIdArrayForUniquenessCheck, $dom, $output, $i, $j);
             }
 
             // trans-unit re-count check
-            $totalTransUnitsId  = count( $transUnitIdArrayForUniquenessCheck );
-            $transUnitsUniqueId = count( array_unique( $transUnitIdArrayForUniquenessCheck ) );
-            if ( $totalTransUnitsId != $transUnitsUniqueId ) {
-                throw new DuplicateTransUnitIdInXliff( "Invalid trans-unit id, duplicate found.", 400 );
+            $totalTransUnitsId  = count($transUnitIdArrayForUniquenessCheck);
+            $transUnitsUniqueId = count(array_unique($transUnitIdArrayForUniquenessCheck));
+            if ($totalTransUnitsId != $transUnitsUniqueId) {
+                throw new DuplicateTransUnitIdInXliff("Invalid trans-unit id, duplicate found.", 400);
             }
 
             $i++;
@@ -53,23 +53,23 @@ 
      *
      * @return array
      */
-    private function extractMetadata( DOMDocument $dom ): array {
+    private function extractMetadata(DOMDocument $dom): array {
         $metadata = [];
 
-        $xliffNode = $dom->getElementsByTagName( 'xliff' )->item( 0 );
-        $fileNode  = $dom->getElementsByTagName( 'file' )->item( 0 );
+        $xliffNode = $dom->getElementsByTagName('xliff')->item(0);
+        $fileNode  = $dom->getElementsByTagName('file')->item(0);
 
         // original
-        $metadata[ 'original' ] = ( null !== $fileNode->attributes->getNamedItem( 'original' ) ) ? $fileNode->attributes->getNamedItem( 'original' )->nodeValue : 'no-name';
+        $metadata['original'] = (null !== $fileNode->attributes->getNamedItem('original')) ? $fileNode->attributes->getNamedItem('original')->nodeValue : 'no-name';
 
         // source-language
-        $metadata[ 'source-language' ] = ( null !== $xliffNode->attributes->getNamedItem( 'srcLang' ) ) ? $xliffNode->attributes->getNamedItem( 'srcLang' )->nodeValue : 'en-US';
+        $metadata['source-language'] = (null !== $xliffNode->attributes->getNamedItem('srcLang')) ? $xliffNode->attributes->getNamedItem('srcLang')->nodeValue : 'en-US';
 
         // datatype
         // @TODO to be implemented
 
         // target-language
-        $metadata[ 'target-language' ] = ( null !== $xliffNode->attributes->getNamedItem( 'trgLang' ) ) ? $xliffNode->attributes->getNamedItem( 'trgLang' )->nodeValue : 'en-US';
+        $metadata['target-language'] = (null !== $xliffNode->attributes->getNamedItem('trgLang')) ? $xliffNode->attributes->getNamedItem('trgLang')->nodeValue : 'en-US';
 
         // custom MateCat x-attribute
         // @TODO to be implemented
@@ -83,16 +83,16 @@ 
      * @return array
      * @throws Exception
      */
-    private function extractNotes( DOMElement $file ): array {
+    private function extractNotes(DOMElement $file): array {
         $notes = [];
 
         // loop <notes> to get nested <note> tag
-        foreach ( $file->childNodes as $childNode ) {
-            if ( $childNode->nodeName === 'notes' ) {
-                foreach ( $childNode->childNodes as $note ) {
-                    $noteValue = trim( $note->nodeValue );
-                    if ( '' !== $noteValue ) {
-                        $notes[] = $this->JSONOrRawContentArray( $noteValue );
+        foreach ($file->childNodes as $childNode) {
+            if ($childNode->nodeName === 'notes') {
+                foreach ($childNode->childNodes as $note) {
+                    $noteValue = trim($note->nodeValue);
+                    if ('' !== $noteValue) {
+                        $notes[] = $this->JSONOrRawContentArray($noteValue);
                     }
                 }
             }
@@ -114,32 +114,32 @@ 
      *
      * @throws Exception
      */
-    protected function extractTransUnit( DOMElement $transUnit, array &$transUnitIdArrayForUniquenessCheck, DomDocument $dom, array &$output, int &$i, int &$j, ?array $contextGroups = [] ) {
+    protected function extractTransUnit(DOMElement $transUnit, array &$transUnitIdArrayForUniquenessCheck, DomDocument $dom, array &$output, int &$i, int &$j, ?array $contextGroups = []) {
         // metadata
-        $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'attr' ] = $this->extractTransUnitMetadata( $transUnit, $transUnitIdArrayForUniquenessCheck );
+        $output['files'][$i]['trans-units'][$j]['attr'] = $this->extractTransUnitMetadata($transUnit, $transUnitIdArrayForUniquenessCheck);
 
         // notes
         // merge <notes> with key and key-note contained in metadata <mda:metaGroup>
-        $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'notes' ] = $this->extractTransUnitNotes( $transUnit );
+        $output['files'][$i]['trans-units'][$j]['notes'] = $this->extractTransUnitNotes($transUnit);
 
         // uuid
-        foreach ( $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'notes' ] as $note ) {
-            if ( isset( $note[ 'raw-content' ] ) && Strings::isAValidUuid( $note[ 'raw-content' ] ) ) {
-                $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'attr' ][ 'uuid' ] = $note[ 'raw-content' ];
+        foreach ($output['files'][$i]['trans-units'][$j]['notes'] as $note) {
+            if (isset($note['raw-content']) && Strings::isAValidUuid($note['raw-content'])) {
+                $output['files'][$i]['trans-units'][$j]['attr']['uuid'] = $note['raw-content'];
             }
         }
 
         // original-data (exclusive for V2)
         // http://docs.oasis-open.org/xliff/xliff-core/v2.0/xliff-core-v2.0.html#originaldata
-        $originalData = $this->extractTransUnitOriginalData( $transUnit );
-        if ( !empty( $originalData ) ) {
-            $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'original-data' ] = $originalData;
+        $originalData = $this->extractTransUnitOriginalData($transUnit);
+        if (!empty($originalData)) {
+            $output['files'][$i]['trans-units'][$j]['original-data'] = $originalData;
         }
 
         // additionalTagData (exclusive for V2)
-        $additionalTagData = $this->extractTransUnitAdditionalTagData( $transUnit );
-        if ( !empty( $additionalTagData ) ) {
-            $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'additional-tag-data' ] = $additionalTagData;
+        $additionalTagData = $this->extractTransUnitAdditionalTagData($transUnit);
+        if (!empty($additionalTagData)) {
+            $output['files'][$i]['trans-units'][$j]['additional-tag-data'] = $additionalTagData;
         }
 
         // content
@@ -159,54 +159,54 @@ 
 
         /** @var DOMElement $segment */
         $c = 0;
-        foreach ( $transUnit->childNodes as $segment ) {
-            if ( $segment->nodeName === 'segment' ) {
+        foreach ($transUnit->childNodes as $segment) {
+            if ($segment->nodeName === 'segment') {
 
                 // check segment id consistency
-                $attr = $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'attr' ];
-                $this->checkSegmentIdConsistency( $segment, $attr );
+                $attr = $output['files'][$i]['trans-units'][$j]['attr'];
+                $this->checkSegmentIdConsistency($segment, $attr);
 
                 // loop <segment> to get nested <source> and <target> tag
-                foreach ( $segment->childNodes as $childNode ) {
-                    if ( $childNode->nodeName === 'source' ) {
-                        $extractedSource               = $this->extractContent( $dom, $childNode );
-                        $source[ 'raw-content' ][ $c ] = $extractedSource[ 'raw-content' ];
+                foreach ($segment->childNodes as $childNode) {
+                    if ($childNode->nodeName === 'source') {
+                        $extractedSource               = $this->extractContent($dom, $childNode);
+                        $source['raw-content'][$c] = $extractedSource['raw-content'];
 
-                        if ( !empty( $extractedSource[ 'attr' ] ) ) {
-                            $source[ 'attr' ][ $c ] = $extractedSource[ 'attr' ];
+                        if (!empty($extractedSource['attr'])) {
+                            $source['attr'][$c] = $extractedSource['attr'];
                         }
 
                         // append value to 'seg-source'
-                        if ( $this->stringContainsMarks( $extractedSource[ 'raw-content' ] ) ) {
-                            $segSource = $this->extractContentWithMarksAndExtTags( $dom, $childNode );
+                        if ($this->stringContainsMarks($extractedSource['raw-content'])) {
+                            $segSource = $this->extractContentWithMarksAndExtTags($dom, $childNode);
                         } else {
                             $segSource[] = [
-                                    'attr'          => $this->extractTagAttributes( $segment ),
-                                    'mid'           => count( $segSource ) > 0 ? count( $segSource ) : 0,
+                                    'attr'          => $this->extractTagAttributes($segment),
+                                    'mid'           => count($segSource) > 0 ? count($segSource) : 0,
                                     'ext-prec-tags' => '',
-                                    'raw-content'   => $extractedSource[ 'raw-content' ],
+                                    'raw-content'   => $extractedSource['raw-content'],
                                     'ext-succ-tags' => '',
                             ];
                         }
                     }
 
-                    if ( $childNode->nodeName === 'target' ) {
-                        $extractedTarget               = $this->extractContent( $dom, $childNode );
-                        $target[ 'raw-content' ][ $c ] = $extractedTarget[ 'raw-content' ];
+                    if ($childNode->nodeName === 'target') {
+                        $extractedTarget               = $this->extractContent($dom, $childNode);
+                        $target['raw-content'][$c] = $extractedTarget['raw-content'];
 
-                        if ( !empty( $extractedTarget[ 'attr' ] ) ) {
-                            $target[ 'attr' ][ $c ] = $extractedTarget[ 'attr' ];
+                        if (!empty($extractedTarget['attr'])) {
+                            $target['attr'][$c] = $extractedTarget['attr'];
                         }
 
                         // append value to 'seg-target'
-                        if ( $this->stringContainsMarks( $extractedTarget[ 'raw-content' ] ) ) {
-                            $segTarget = $this->extractContentWithMarksAndExtTags( $dom, $childNode );
+                        if ($this->stringContainsMarks($extractedTarget['raw-content'])) {
+                            $segTarget = $this->extractContentWithMarksAndExtTags($dom, $childNode);
                         } else {
                             $segTarget[] = [
-                                    'attr'          => $this->extractTagAttributes( $segment ),
-                                    'mid'           => count( $segTarget ) > 0 ? count( $segTarget ) : 0,
+                                    'attr'          => $this->extractTagAttributes($segment),
+                                    'mid'           => count($segTarget) > 0 ? count($segTarget) : 0,
                                     'ext-prec-tags' => '',
-                                    'raw-content'   => $extractedTarget[ 'raw-content' ],
+                                    'raw-content'   => $extractedTarget['raw-content'],
                                     'ext-succ-tags' => '',
                             ];
                         }
@@ -217,10 +217,10 @@ 
             }
         }
 
-        $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'source' ]     = $source;
-        $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'target' ]     = $target;
-        $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'seg-source' ] = $segSource;
-        $output[ 'files' ][ $i ][ 'trans-units' ][ $j ][ 'seg-target' ] = $segTarget;
+        $output['files'][$i]['trans-units'][$j]['source']     = $source;
+        $output['files'][$i]['trans-units'][$j]['target']     = $target;
+        $output['files'][$i]['trans-units'][$j]['seg-source'] = $segSource;
+        $output['files'][$i]['trans-units'][$j]['seg-target'] = $segTarget;
 
         $j++;
     }
@@ -231,46 +231,46 @@ 
      *
      * @return array
      */
-    private function extractTransUnitMetadata( DOMElement $transUnit, ?array &$transUnitIdArrayForUniquenessCheck = [] ): array {
+    private function extractTransUnitMetadata(DOMElement $transUnit, ?array &$transUnitIdArrayForUniquenessCheck = []): array {
         $metadata = [];
 
         // id
-        if ( null === $transUnit->attributes->getNamedItem( 'id' ) ) {
-            throw new NotFoundIdInTransUnit( 'Invalid trans-unit id found. EMPTY value', 400 );
+        if (null === $transUnit->attributes->getNamedItem('id')) {
+            throw new NotFoundIdInTransUnit('Invalid trans-unit id found. EMPTY value', 400);
         }
 
-        $id = $transUnit->attributes->getNamedItem( 'id' )->nodeValue;
+        $id = $transUnit->attributes->getNamedItem('id')->nodeValue;
 
-        if ( strlen( $id ) > 100 ) {
-            throw new SegmentIdTooLongException( 'Segment-id too long. Max 100 characters allowed', 400 );
+        if (strlen($id) > 100) {
+            throw new SegmentIdTooLongException('Segment-id too long. Max 100 characters allowed', 400);
         }
 
         $transUnitIdArrayForUniquenessCheck[] = $id;
-        $metadata[ 'id' ]                     = $id;
+        $metadata['id']                     = $id;
 
         // name
-        if ( null !== $transUnit->attributes->getNamedItem( 'name' ) ) {
-            $metadata[ 'name' ] = $transUnit->attributes->getNamedItem( 'name' )->nodeValue;
+        if (null !== $transUnit->attributes->getNamedItem('name')) {
+            $metadata['name'] = $transUnit->attributes->getNamedItem('name')->nodeValue;
         }
         
         // translate
-        if ( null !== $transUnit->attributes->getNamedItem( 'translate' ) ) {
-            $metadata[ 'translate' ] = $transUnit->attributes->getNamedItem( 'translate' )->nodeValue;
+        if (null !== $transUnit->attributes->getNamedItem('translate')) {
+            $metadata['translate'] = $transUnit->attributes->getNamedItem('translate')->nodeValue;
         }
 
         // tGroupBegin
-        if ( null !== $transUnit->attributes->getNamedItem( 'tGroupBegin' ) ) {
-            $metadata[ 'tGroupBegin' ] = $transUnit->attributes->getNamedItem( 'tGroupBegin' )->nodeValue;
+        if (null !== $transUnit->attributes->getNamedItem('tGroupBegin')) {
+            $metadata['tGroupBegin'] = $transUnit->attributes->getNamedItem('tGroupBegin')->nodeValue;
         }
 
         // tGroupEnd
-        if ( null !== $transUnit->attributes->getNamedItem( 'tGroupEnd' ) ) {
-            $metadata[ 'tGroupEnd' ] = $transUnit->attributes->getNamedItem( 'tGroupEnd' )->nodeValue;
+        if (null !== $transUnit->attributes->getNamedItem('tGroupEnd')) {
+            $metadata['tGroupEnd'] = $transUnit->attributes->getNamedItem('tGroupEnd')->nodeValue;
         }
 
         // sizeRestriction
-        if ( null !== $transUnit->attributes->getNamedItem( 'sizeRestriction' ) && '' !== $transUnit->attributes->getNamedItem( 'sizeRestriction' )->nodeValue ) {
-            $metadata[ 'sizeRestriction' ] = (int)$transUnit->attributes->getNamedItem( 'sizeRestriction' )->nodeValue;
+        if (null !== $transUnit->attributes->getNamedItem('sizeRestriction') && '' !== $transUnit->attributes->getNamedItem('sizeRestriction')->nodeValue) {
+            $metadata['sizeRestriction'] = (int)$transUnit->attributes->getNamedItem('sizeRestriction')->nodeValue;
         }
 
         return $metadata;
@@ -282,31 +282,31 @@ 
      * @return array
      * @throws Exception
      */
-    private function extractTransUnitOriginalData( DOMElement $transUnit ): array {
+    private function extractTransUnitOriginalData(DOMElement $transUnit): array {
         $originalData = [];
 
         // loop <originalData> to get nested content
-        foreach ( $transUnit->childNodes as $childNode ) {
-            if ( $childNode->nodeName === 'originalData' ) {
-                foreach ( $childNode->childNodes as $data ) {
-                    if ( null !== $data->attributes && null !== $data->attributes->getNamedItem( 'id' ) ) {
-                        $dataId = $data->attributes->getNamedItem( 'id' )->nodeValue;
+        foreach ($transUnit->childNodes as $childNode) {
+            if ($childNode->nodeName === 'originalData') {
+                foreach ($childNode->childNodes as $data) {
+                    if (null !== $data->attributes && null !== $data->attributes->getNamedItem('id')) {
+                        $dataId = $data->attributes->getNamedItem('id')->nodeValue;
 
-                        $dataValue = str_replace( Placeholder::WHITE_SPACE_PLACEHOLDER, ' ', $data->nodeValue );
-                        $dataValue = str_replace( Placeholder::NEW_LINE_PLACEHOLDER, '\n', $dataValue );
-                        $dataValue = str_replace( Placeholder::TAB_PLACEHOLDER, '\t', $dataValue );
+                        $dataValue = str_replace(Placeholder::WHITE_SPACE_PLACEHOLDER, ' ', $data->nodeValue);
+                        $dataValue = str_replace(Placeholder::NEW_LINE_PLACEHOLDER, '\n', $dataValue);
+                        $dataValue = str_replace(Placeholder::TAB_PLACEHOLDER, '\t', $dataValue);
 
-                        if ( '' !== $dataValue ) {
+                        if ('' !== $dataValue) {
 
-                            $jsonOrRawContentArray = $this->JSONOrRawContentArray( $dataValue, false );
+                            $jsonOrRawContentArray = $this->JSONOrRawContentArray($dataValue, false);
 
                             // restore xliff tags
-                            if ( isset( $jsonOrRawContentArray[ 'json' ] ) ) {
-                                $jsonOrRawContentArray[ 'json' ] = str_replace( [ Placeholder::LT_PLACEHOLDER, Placeholder::GT_PLACEHOLDER ], [ '&lt;', '&gt;' ], $jsonOrRawContentArray[ 'json' ] );
+                            if (isset($jsonOrRawContentArray['json'])) {
+                                $jsonOrRawContentArray['json'] = str_replace([Placeholder::LT_PLACEHOLDER, Placeholder::GT_PLACEHOLDER], ['&lt;', '&gt;'], $jsonOrRawContentArray['json']);
                             }
 
-                            if ( isset( $jsonOrRawContentArray[ 'raw-content' ] ) ) {
-                                $jsonOrRawContentArray[ 'raw-content' ] = str_replace( [ Placeholder::LT_PLACEHOLDER, Placeholder::GT_PLACEHOLDER ], [ '&lt;', '&gt;' ], $jsonOrRawContentArray[ 'raw-content' ] );
+                            if (isset($jsonOrRawContentArray['raw-content'])) {
+                                $jsonOrRawContentArray['raw-content'] = str_replace([Placeholder::LT_PLACEHOLDER, Placeholder::GT_PLACEHOLDER], ['&lt;', '&gt;'], $jsonOrRawContentArray['raw-content']);
                             }
 
                             $originalData[] = array_merge(
@@ -331,41 +331,41 @@ 
      *
      * @return array
      */
-    private function extractTransUnitAdditionalTagData( DOMElement $transUnit ): array {
+    private function extractTransUnitAdditionalTagData(DOMElement $transUnit): array {
         $additionalTagData = [];
 
         // loop <originalData> to get nested content
-        foreach ( $transUnit->childNodes as $childNode ) {
-            if ( $childNode->nodeName === 'memsource:additionalTagData' ) {
-                foreach ( $childNode->childNodes as $data ) {
+        foreach ($transUnit->childNodes as $childNode) {
+            if ($childNode->nodeName === 'memsource:additionalTagData') {
+                foreach ($childNode->childNodes as $data) {
                     $dataArray = [];
 
                     // id
-                    if ( $data->nodeName === 'memsource:tag' ) {
-                        if ( null !== $data->attributes && null !== $data->attributes->getNamedItem( 'id' ) ) {
-                            $dataId                      = $data->attributes->getNamedItem( 'id' )->nodeValue;
-                            $dataArray[ 'attr' ][ 'id' ] = $dataId;
+                    if ($data->nodeName === 'memsource:tag') {
+                        if (null !== $data->attributes && null !== $data->attributes->getNamedItem('id')) {
+                            $dataId                      = $data->attributes->getNamedItem('id')->nodeValue;
+                            $dataArray['attr']['id'] = $dataId;
                         }
                     }
 
                     // in PHP 7.4 $data->childNodes is an empty DomNodeList, it is iterable with size 0
                     // PHP 5.6 check: in php 5.6 $data->childNodes can be null
-                    if ( $data->childNodes != null ) {
+                    if ($data->childNodes != null) {
 
                         // content
-                        foreach ( $data->childNodes as $datum ) {
-                            if ( $datum->nodeName === 'memsource:tagId' ) {
-                                $dataArray[ 'raw-content' ][ 'tagId' ] = $datum->nodeValue;
+                        foreach ($data->childNodes as $datum) {
+                            if ($datum->nodeName === 'memsource:tagId') {
+                                $dataArray['raw-content']['tagId'] = $datum->nodeValue;
                             }
 
-                            if ( $datum->nodeName === 'memsource:type' ) {
-                                $dataArray[ 'raw-content' ][ 'type' ] = $datum->nodeValue;
+                            if ($datum->nodeName === 'memsource:type') {
+                                $dataArray['raw-content']['type'] = $datum->nodeValue;
                             }
                         }
 
                     }
 
-                    if ( !empty( $dataArray ) ) {
+                    if (!empty($dataArray)) {
                         $additionalTagData[] = $dataArray;
                     }
                 }
@@ -381,15 +381,15 @@ 
      * @param DOMElement $segment
      * @param array      $attr
      */
-    private function checkSegmentIdConsistency( DOMElement $segment, array $attr ) {
-        if ( isset( $attr[ 'tGroupBegin' ] ) && isset( $attr[ 'tGroupEnd' ] ) && $segment->attributes->getNamedItem( 'id' ) ) {
-            $id  = $segment->attributes->getNamedItem( 'id' )->nodeValue;
-            $min = (int)$attr[ 'tGroupBegin' ];
-            $max = (int)$attr[ 'tGroupEnd' ];
-
-            if ( false === ( ( $min <= $id ) && ( $id <= $max ) ) ) {
-                if ( $this->logger ) {
-                    $this->logger->warning( 'Segment #' . $id . ' is not included within tGroupBegin and tGroupEnd' );
+    private function checkSegmentIdConsistency(DOMElement $segment, array $attr) {
+        if (isset($attr['tGroupBegin']) && isset($attr['tGroupEnd']) && $segment->attributes->getNamedItem('id')) {
+            $id  = $segment->attributes->getNamedItem('id')->nodeValue;
+            $min = (int)$attr['tGroupBegin'];
+            $max = (int)$attr['tGroupEnd'];
+
+            if (false === (($min <= $id) && ($id <= $max))) {
+                if ($this->logger) {
+                    $this->logger->warning('Segment #' . $id . ' is not included within tGroupBegin and tGroupEnd');
                 }
             }
         }
@@ -401,31 +401,31 @@ 
      * @return array
      * @throws Exception
      */
-    private function extractTransUnitNotes( DOMElement $transUnit ): array {
+    private function extractTransUnitNotes(DOMElement $transUnit): array {
         $notes = [];
 
         // loop <notes> to get nested <note> tag
-        foreach ( $transUnit->childNodes as $childNode ) {
-            if ( $childNode->nodeName == 'notes' ) {
-                foreach ( $childNode->childNodes as $note ) {
-                    $noteValue = trim( $note->nodeValue );
-                    if ( '' !== $noteValue ) {
-                        $notes[] = $this->JSONOrRawContentArray( $noteValue );
+        foreach ($transUnit->childNodes as $childNode) {
+            if ($childNode->nodeName == 'notes') {
+                foreach ($childNode->childNodes as $note) {
+                    $noteValue = trim($note->nodeValue);
+                    if ('' !== $noteValue) {
+                        $notes[] = $this->JSONOrRawContentArray($noteValue);
                     }
                 }
             }
 
-            if ( $childNode->nodeName === 'mda:metadata' ) {
-                foreach ( $childNode->childNodes as $metadata ) {
-                    if ( $metadata->nodeName === 'mda:metaGroup' ) {
-                        foreach ( $metadata->childNodes as $meta ) {
-                            if ( null !== $meta->attributes && null !== $meta->attributes->getNamedItem( 'type' ) ) {
-                                $type      = $meta->attributes->getNamedItem( 'type' )->nodeValue;
-                                $metaValue = trim( $meta->nodeValue );
+            if ($childNode->nodeName === 'mda:metadata') {
+                foreach ($childNode->childNodes as $metadata) {
+                    if ($metadata->nodeName === 'mda:metaGroup') {
+                        foreach ($metadata->childNodes as $meta) {
+                            if (null !== $meta->attributes && null !== $meta->attributes->getNamedItem('type')) {
+                                $type      = $meta->attributes->getNamedItem('type')->nodeValue;
+                                $metaValue = trim($meta->nodeValue);
 
-                                if ( '' !== $metaValue ) {
+                                if ('' !== $metaValue) {
                                     $notes[] = array_merge(
-                                            $this->JSONOrRawContentArray( $metaValue ),
+                                            $this->JSONOrRawContentArray($metaValue),
                                             [
                                                     'attr' => [
                                                             'type' => $type