matecat / xliff-parser

src/XliffUtils/CheckPipeline/CheckMateCATConverter.php

Spacing +10 added lines, -10 removed lines

@@ -8,20 +8,20 @@
      *
      * @return array|null
      */
-    public function check( ?array $tmp = [] ): ?array {
+    public function check(?array $tmp = []): ?array {
         $fileType = [];
 
-        if ( isset( $tmp[ 0 ] ) ) {
-            preg_match( '#tool-id\s*=\s*"matecat-converter(\s+([^"]+))?"#i', $tmp[ 0 ], $matches );
-            if ( !empty( $matches ) ) {
-                $fileType[ 'proprietary' ]            = false;
-                $fileType[ 'proprietary_name' ]       = 'MateCAT Converter';
-                $fileType[ 'proprietary_short_name' ] = 'matecat_converter';
-                if ( isset( $matches[ 2 ] ) ) {
-                    $fileType[ 'converter_version' ] = $matches[ 2 ];
+        if (isset($tmp[0])) {
+            preg_match('#tool-id\s*=\s*"matecat-converter(\s+([^"]+))?"#i', $tmp[0], $matches);
+            if (!empty($matches)) {
+                $fileType['proprietary']            = false;
+                $fileType['proprietary_name']       = 'MateCAT Converter';
+                $fileType['proprietary_short_name'] = 'matecat_converter';
+                if (isset($matches[2])) {
+                    $fileType['converter_version'] = $matches[2];
                 } else {
                     // First converter release didn't specify version
-                    $fileType[ 'converter_version' ] = '1.0';
+                    $fileType['converter_version'] = '1.0';
                 }
 
                 return $fileType;

src/XliffUtils/CheckPipeline/CheckXliffVersion2.php

Spacing +12 added lines, -12 removed lines

@@ -8,22 +8,22 @@
      *
      * @return array|null
      */
-    public function check( ?array $tmp = [] ): ?array {
+    public function check(?array $tmp = []): ?array {
         $fileType = [];
 
-        if ( isset( $tmp[ 0 ] ) ) {
-            preg_match( '|<xliff.*?\sversion\s?=\s?["\'](.*?)["\']|si', substr( $tmp[ 0 ], 0, 1000 ), $versionMatches );
-            preg_match( '|<xliff.*?\sxmlns\s?=\s?["\']urn:oasis:names:tc:xliff:document:(.*?)["\']|si', substr( $tmp[ 0 ], 0, 1000 ), $xmlnsMatches );
+        if (isset($tmp[0])) {
+            preg_match('|<xliff.*?\sversion\s?=\s?["\'](.*?)["\']|si', substr($tmp[0], 0, 1000), $versionMatches);
+            preg_match('|<xliff.*?\sxmlns\s?=\s?["\']urn:oasis:names:tc:xliff:document:(.*?)["\']|si', substr($tmp[0], 0, 1000), $xmlnsMatches);
 
-            if ( !empty( $versionMatches ) && !empty( $xmlnsMatches ) ) {
-                $version = $versionMatches[ 1 ];
-                $xmlns   = $xmlnsMatches[ 1 ];
+            if (!empty($versionMatches) && !empty($xmlnsMatches)) {
+                $version = $versionMatches[1];
+                $xmlns   = $xmlnsMatches[1];
 
-                if ( $version === $xmlns && $version >= 2 ) {
-                    $fileType[ 'proprietary' ]            = false;
-                    $fileType[ 'proprietary_name' ]       = 'Xliff v' . $version . ' File';
-                    $fileType[ 'proprietary_short_name' ] = 'xliff_v2';
-                    $fileType[ 'converter_version' ]      = '2.0';
+                if ($version === $xmlns && $version >= 2) {
+                    $fileType['proprietary']            = false;
+                    $fileType['proprietary_name']       = 'Xliff v' . $version . ' File';
+                    $fileType['proprietary_short_name'] = 'xliff_v2';
+                    $fileType['converter_version']      = '2.0';
 
                     return $fileType;
                 }

src/XliffUtils/CheckPipeline/CheckInterface.php

Spacing +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
      *
      * @return array|null
      */
-    public function check( ?array $tmp = [] ): ?array;
+    public function check(?array $tmp = []): ?array;
 }

src/XliffUtils/XliffVersionDetector.php

Spacing +12 added lines, -12 removed lines

@@ -9,12 +9,12 @@ 
     /**
      * @var array
      */
-    private static array $versions_1 = [ '1.0', '1.1', '1.2' ];
+    private static array $versions_1 = ['1.0', '1.1', '1.2'];
 
     /**
      * @var array
      */
-    private static array $versions_2 = [ '2.0', '2.1' ];
+    private static array $versions_2 = ['2.0', '2.1'];
 
     /**
      * @param string $xliffContent
@@ -23,16 +23,16 @@ 
      * @throws NotSupportedVersionException
      * @throws NotValidFileException
      */
-    public static function detect( string $xliffContent ): int {
-        preg_match( '|<xliff.*?\sversion\s?=\s?["\'](.*?)["\']|si', substr( $xliffContent, 0, 1000 ), $versionMatches );
+    public static function detect(string $xliffContent): int {
+        preg_match('|<xliff.*?\sversion\s?=\s?["\'](.*?)["\']|si', substr($xliffContent, 0, 1000), $versionMatches);
 
-        if ( empty( $versionMatches ) ) {
-            throw new NotValidFileException( 'This is not a valid xliff file' );
+        if (empty($versionMatches)) {
+            throw new NotValidFileException('This is not a valid xliff file');
         }
 
-        $version = $versionMatches[ 1 ];
+        $version = $versionMatches[1];
 
-        return self::resolveVersion( $version );
+        return self::resolveVersion($version);
     }
 
     /**
@@ -41,15 +41,15 @@ 
      * @return int
      * @throws NotSupportedVersionException
      */
-    private static function resolveVersion( string $version ): int {
-        if ( in_array( $version, self::$versions_1 ) ) {
+    private static function resolveVersion(string $version): int {
+        if (in_array($version, self::$versions_1)) {
             return 1;
         }
 
-        if ( in_array( $version, self::$versions_2 ) ) {
+        if (in_array($version, self::$versions_2)) {
             return 2;
         }
 
-        throw new NotSupportedVersionException( 'Not supported version' );
+        throw new NotSupportedVersionException('Not supported version');
     }
 }

src/XliffReplacer/XliffReplacerFactory.php

Spacing +6 added lines, -6 removed lines

@@ -28,14 +28,14 @@
             ?LoggerInterface                $logger = null,
             ?XliffReplacerCallbackInterface $callback = null
     ): AbstractXliffReplacer {
-        $info = XliffProprietaryDetect::getInfo( $originalXliffPath );
+        $info = XliffProprietaryDetect::getInfo($originalXliffPath);
 
-        if ( $info[ 'version' ] == 1 && $info[ 'proprietary_short_name' ] !== 'trados' ) {
-            return new Xliff12( $originalXliffPath, $info[ 'version' ], $data, $transUnits, $targetLang, $outputFilePath, $setSourceInTarget, $logger, $callback );
-        } elseif ( $info[ 'version' ] == 2 ) {
-            return new Xliff20( $originalXliffPath, $info[ 'version' ], $data, $transUnits, $targetLang, $outputFilePath, $setSourceInTarget, $logger, $callback );
+        if ($info['version'] == 1 && $info['proprietary_short_name'] !== 'trados') {
+            return new Xliff12($originalXliffPath, $info['version'], $data, $transUnits, $targetLang, $outputFilePath, $setSourceInTarget, $logger, $callback);
+        } elseif ($info['version'] == 2) {
+            return new Xliff20($originalXliffPath, $info['version'], $data, $transUnits, $targetLang, $outputFilePath, $setSourceInTarget, $logger, $callback);
         }
 
-        return new XliffSdl( $originalXliffPath, $info[ 'version' ], $data, $transUnits, $targetLang, $outputFilePath, $setSourceInTarget, $logger, $callback );
+        return new XliffSdl($originalXliffPath, $info['version'], $data, $transUnits, $targetLang, $outputFilePath, $setSourceInTarget, $logger, $callback);
     }
 }

src/XliffReplacer/XliffSdl.php

Spacing +20 added lines, -20 removed lines

@@ -16,24 +16,24 @@ 
     /**
      * @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);
 
         // check if we are entering into a <target>
-        $this->checkSetInTarget( $name );
+        $this->checkSetInTarget($name);
 
         // reset Marker positions
-        if ( 'sdl:seg-defs' == $name ) {
+        if ('sdl:seg-defs' == $name) {
             $this->segmentInUnitPosition = 0;
         }
 
         // 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) {
 
             // costruct tag
             $tag = "<$name ";
@@ -43,16 +43,16 @@ 
             // so the check on it's name is not enough
             $_sdlStatus_confWritten = false;
 
-            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 {
                     //normal tag flux, put attributes in it
                     // Warning, this is NOT an elseif
-                    if ( $k != 'conf' ) {
+                    if ($k != 'conf') {
                         //put also the current attribute in it if it is not a "conf" attribute
                         $tag .= "$k=\"$v\" ";
                     }
@@ -61,11 +61,11 @@ 
 
             $seg = $this->getCurrentSegment();
 
-            if ( 'sdl:seg' == $name && !empty( $seg ) and isset( $seg[ 'sid' ] ) ) {
-                $tag .= $this->prepareTargetStatuses( $seg );
+            if ('sdl:seg' == $name && !empty($seg) and isset($seg['sid'])) {
+                $tag .= $this->prepareTargetStatuses($seg);
             }
 
-            $this->checkForSelfClosedTagAndFlush( $parser, $tag );
+            $this->checkForSelfClosedTagAndFlush($parser, $tag);
 
         }
 
@@ -76,7 +76,7 @@ 
      *
      * @return string
      */
-    protected function prepareTargetStatuses( $segment ): string {
+    protected function prepareTargetStatuses($segment): string {
         $statusMap = [
                 'NEW'        => '',
                 'DRAFT'      => 'Draft',
@@ -86,19 +86,19 @@ 
                 'REJECTED'   => 'RejectedTranslation',
         ];
 
-        return "conf=\"{$statusMap[ $segment[ 'status' ] ]}\" ";
+        return "conf=\"{$statusMap[$segment['status']]}\" ";
     }
 
-    protected function rebuildMarks( array $seg, string $translation ): string {
+    protected function rebuildMarks(array $seg, string $translation): string {
 
-        $trailingSpaces = str_repeat( ' ', Strings::getTheNumberOfTrailingSpaces( $translation ) );
+        $trailingSpaces = str_repeat(' ', Strings::getTheNumberOfTrailingSpaces($translation));
 
-        if ( $seg[ 'mrk_id' ] !== null && $seg[ 'mrk_id' ] != '' ) {
-            if ( $this->targetLang === 'ja-JP' ) {
-                $seg[ 'mrk_succ_tags' ] = ltrim( $seg[ 'mrk_succ_tags' ] );
+        if ($seg['mrk_id'] !== null && $seg['mrk_id'] != '') {
+            if ($this->targetLang === 'ja-JP') {
+                $seg['mrk_succ_tags'] = ltrim($seg['mrk_succ_tags']);
             }
 
-            $translation = "<mrk mid=\"" . $seg[ 'mrk_id' ] . "\" mtype=\"seg\">" . $seg[ 'mrk_prev_tags' ] . rtrim( $translation ) . $seg[ 'mrk_succ_tags' ] . "</mrk>" . $trailingSpaces;
+            $translation = "<mrk mid=\"" . $seg['mrk_id'] . "\" mtype=\"seg\">" . $seg['mrk_prev_tags'] . rtrim($translation) . $seg['mrk_succ_tags'] . "</mrk>" . $trailingSpaces;
         }
 
         return $translation;

src/XliffReplacer/XliffReplacerCallbackInterface.php

Spacing +1 added lines, -1 removed lines

@@ -12,5 +12,5 @@
      *
      * @return bool
      */
-    public function thereAreErrors( int $segmentId, string $segment, string $translation, ?array $dataRefMap = [], ?string $error = null ): bool;
+    public function thereAreErrors(int $segmentId, string $segment, string $translation, ?array $dataRefMap = [], ?string $error = null): bool;
 }

src/XliffReplacer/StatusToStateAttribute.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
             ?string $lastMrkState = null
     ): array {
 
-        $status       = empty( $status ) ? TranslationStatus::STATUS_TRANSLATED : $status;
+        $status = empty($status) ? TranslationStatus::STATUS_TRANSLATED : $status;
 
         $stateLevelsMap = [
                 TranslationStatus::STATUS_APPROVED2  => 100,
@@ -37,26 +37,26 @@ 
                 TranslationStatus::STATUS_NEW        => 50
         ];
 
-        $orderedValues = array_flip( $stateLevelsMap );
+        $orderedValues = array_flip($stateLevelsMap);
 
         // Define state mappings for different statuses
         $stateMap = [
-                TranslationStatus::STATUS_APPROVED2  => [ "state=\"final\"", TranslationStatus::STATUS_APPROVED2 ],
+                TranslationStatus::STATUS_APPROVED2  => ["state=\"final\"", TranslationStatus::STATUS_APPROVED2],
                 TranslationStatus::STATUS_APPROVED   => [
-                        ( $xliffVersion === 2 ) ? "state=\"reviewed\"" : "state=\"signed-off\"",
+                        ($xliffVersion === 2) ? "state=\"reviewed\"" : "state=\"signed-off\"",
                         TranslationStatus::STATUS_APPROVED
                 ],
-                TranslationStatus::STATUS_TRANSLATED => [ "state=\"translated\"", TranslationStatus::STATUS_TRANSLATED ],
+                TranslationStatus::STATUS_TRANSLATED => ["state=\"translated\"", TranslationStatus::STATUS_TRANSLATED],
                 TranslationStatus::STATUS_REJECTED   => [
-                        ( $xliffVersion === 2 ) ? "state=\"initial\"" : "state=\"needs-review-translation\"",
+                        ($xliffVersion === 2) ? "state=\"initial\"" : "state=\"needs-review-translation\"",
                         TranslationStatus::STATUS_REJECTED
                 ],
                 TranslationStatus::STATUS_NEW        => [
-                        ( $xliffVersion === 2 ) ? "state=\"initial\"" : "state=\"new\"",
+                        ($xliffVersion === 2) ? "state=\"initial\"" : "state=\"new\"",
                         TranslationStatus::STATUS_NEW
                 ],
                 TranslationStatus::STATUS_DRAFT      => [
-                        ( $xliffVersion === 2 ) ? "state=\"initial\"" : "state=\"new\"",
+                        ($xliffVersion === 2) ? "state=\"initial\"" : "state=\"new\"",
                         TranslationStatus::STATUS_DRAFT
                 ],
         ];
@@ -67,14 +67,14 @@ 
         // ---> $seg[ 'status' ] is NULL
         // If lastMrkState is empty
         $minStatus = min(
-                $stateLevelsMap[ $status ],
-                ( $stateLevelsMap[ $lastMrkState ] ?? $stateLevelsMap[ TranslationStatus::STATUS_NEW ] )
+                $stateLevelsMap[$status],
+                ($stateLevelsMap[$lastMrkState] ?? $stateLevelsMap[TranslationStatus::STATUS_NEW])
         );
 
         // If the last mark state is set, get the minimum value, otherwise get the current state
-        [ $state_prop, $lastMrkState ] = empty( $lastMrkState ) ? $stateMap[ $status ] : $stateMap[ $orderedValues[ $minStatus ] ];
+        [$state_prop, $lastMrkState] = empty($lastMrkState) ? $stateMap[$status] : $stateMap[$orderedValues[$minStatus]];
 
-        return [ $state_prop, $lastMrkState ];
+        return [$state_prop, $lastMrkState];
 
     }
 

src/XliffReplacer/Xliff12.php

Spacing +55 added lines, -55 removed lines

@@ -27,28 +27,28 @@ 
     /**
      * @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->checkSetInTarget( $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 {
@@ -59,20 +59,20 @@ 
 
             $seg = $this->getCurrentSegment();
 
-            if ( $name === $this->tuTagName && !empty( $seg ) and isset( $seg[ 'sid' ] ) ) {
+            if ($name === $this->tuTagName && !empty($seg) and 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);
 
         }
 
@@ -82,7 +82,7 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagClose( $parser, string $name ) {
+    protected function tagClose($parser, string $name) {
         $tag = '';
 
         /**
@@ -91,15 +91,15 @@ 
          *
          * self::tagOpen method
          */
-        if ( !$this->isEmpty ) {
+        if (!$this->isEmpty) {
 
-            if ( !$this->inTarget ) {
+            if (!$this->inTarget) {
                 $tag = "</$name>";
             }
 
-            if ( 'target' == $name ) {
+            if ('target' == $name) {
 
-                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
@@ -110,42 +110,42 @@ 
                 $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);
             }
 
         } else {
@@ -154,7 +154,7 @@ 
         }
 
         // 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;
@@ -171,31 +171,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;
@@ -210,10 +210,10 @@ 
      *
      * @return string
      */
-    private function createTargetTag( string $translation, string $stateProp ): string {
+    private 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;
 
@@ -229,7 +229,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.
@@ -242,8 +242,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;
             }
 
             /*
@@ -252,33 +252,33 @@ 
              * ( 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);
 
     }