matecat / xliff-parser

src/XliffReplacer/XliffReplacerFactory.php

Spacing +6 added lines, -6 removed lines

@@ -28,14 +28,14 @@
             LoggerInterface                $logger = null,
             XliffReplacerCallbackInterface $callback = null
     ) {
-        $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/Xliff12.php

Spacing +60 added lines, -60 removed lines

@@ -27,14 +27,14 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagOpen( $parser, $name, $attr ) {
+    protected function tagOpen($parser, $name, $attr) {
 
-        $this->handleOpenUnit( $name, $attr );
+        $this->handleOpenUnit($name, $attr);
 
         // check if we are entering into a <target>
-        if ( 'target' === $name ) {
+        if ('target' === $name) {
 
-            if ( $this->currentTransUnitIsTranslatable === 'no' ) {
+            if ($this->currentTransUnitIsTranslatable === 'no') {
                 $this->inTarget = false;
             } else {
                 $this->inTarget = true;
@@ -42,23 +42,23 @@ 
         }
 
         // open buffer
-        if ( in_array( $name, $this->nodesToBuffer ) ) {
+        if (in_array($name, $this->nodesToBuffer)) {
             $this->bufferIsActive = true;
         }
 
         // 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 {
@@ -69,11 +69,11 @@ 
 
             $seg = $this->getCurrentSegment();
 
-            if ( $name === $this->tuTagName && !empty( $seg ) and isset( $seg[ 'sid' ] ) ) {
+            if ($name === $this->tuTagName && !empty($seg) and isset($seg['sid'])) {
 
-                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']}\" ";
                     }
                 }
 
@@ -81,14 +81,14 @@ 
 
             // Add MateCat specific namespace.
             // Add trgLang
-            if ( $name === 'xliff' ) {
-                if ( !array_key_exists( 'xmlns:mtc', $attr ) ) {
+            if ($name === 'xliff') {
+                if (!array_key_exists('xmlns:mtc', $attr)) {
                     $tag .= ' xmlns:mtc="https://www.matecat.com" ';
                 }
-                $tag = preg_replace( '/trgLang="(.*?)"/', 'trgLang="' . $this->targetLang . '"', $tag );
+                $tag = preg_replace('/trgLang="(.*?)"/', 'trgLang="' . $this->targetLang . '"', $tag);
             }
 
-            $this->checkForSelfClosedTagAndFlush( $parser, $tag );
+            $this->checkForSelfClosedTagAndFlush($parser, $tag);
 
         }
 
@@ -98,7 +98,7 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagClose( $parser, $name ) {
+    protected function tagClose($parser, $name) {
         $tag = '';
 
         /**
@@ -107,15 +107,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
@@ -126,42 +126,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 {
@@ -170,7 +170,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;
@@ -187,35 +187,35 @@ 
      *
      * @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' ] != '' ) {
-            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' ] . $translation . $seg[ 'mrk_succ_tags' ] . "</mrk>";
+            $translation = "<mrk mid=\"" . $seg['mrk_id'] . "\" mtype=\"seg\">" . $seg['mrk_prev_tags'] . $translation . $seg['mrk_succ_tags'] . "</mrk>";
         }
 
         return $translation;
@@ -230,10 +230,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;
 
@@ -249,7 +249,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.
@@ -262,8 +262,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;
             }
 
             /*
@@ -272,33 +272,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( $seg[ 'status' ], $this->xliffVersion, $stateProp, $lastMrkState );
+            [$stateProp, $lastMrkState] = StatusToStateAttribute::getState($seg['status'], $this->xliffVersion, $stateProp, $lastMrkState);
 
         }
 
         //append translation
-        return $this->createTargetTag( $translation, $stateProp );
+        return $this->createTargetTag($translation, $stateProp);
 
     }
 

src/XliffReplacer/old__XliffSAXTranslationReplacer.php

Spacing +163 added lines, -163 removed lines

@@ -33,38 +33,38 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagOpen( $parser, $name, $attr ) {
+    protected function tagOpen($parser, $name, $attr) {
         // check if we are entering into a <trans-unit> (xliff v1.*) or <unit> (xliff v2.*)
-        if ( $this->tuTagName === $name ) {
+        if ($this->tuTagName === $name) {
             $this->inTU = true;
 
             // get id
             // trim to first 100 characters because this is the limit on Matecat's DB
-            $this->currentTransUnitId = substr( $attr[ 'id' ], 0, 100 );
+            $this->currentTransUnitId = substr($attr['id'], 0, 100);
 
             // `translate` attribute can be only yes or no
-            if ( isset( $attr[ 'translate' ] ) && $attr[ 'translate' ] === 'no' ) {
-                $attr[ 'translate' ] = 'no';
+            if (isset($attr['translate']) && $attr['translate'] === 'no') {
+                $attr['translate'] = 'no';
             } else {
-                $attr[ 'translate' ] = 'yes';
+                $attr['translate'] = 'yes';
             }
 
             // current 'translate' attribute of the current trans-unit
-            $this->currentTransUnitIsTranslatable = $attr[ 'translate' ];
+            $this->currentTransUnitIsTranslatable = $attr['translate'];
         }
 
-        if ( 'source' === $name ) {
+        if ('source' === $name) {
             $this->sourceAttributes = $attr;
         }
 
-        if ( 'mda:metadata' === $name ) {
+        if ('mda:metadata' === $name) {
             $this->unitContainsMda = true;
         }
 
         // check if we are entering into a <target>
-        if ( 'target' === $name ) {
+        if ('target' === $name) {
 
-            if ( $this->currentTransUnitIsTranslatable === 'no' ) {
+            if ($this->currentTransUnitIsTranslatable === 'no') {
                 $this->inTarget = false;
             } else {
                 $this->inTarget = true;
@@ -73,7 +73,7 @@ 
 
         // 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 = '';
 
@@ -95,8 +95,8 @@ 
             //
             // http://docs.oasis-open.org/xliff/xliff-core/v2.0/os/xliff-core-v2.0-os.html#unit
             //
-            if ( $this->xliffVersion === 2 && ( $name === 'notes' || $name === 'originalData' || $name === 'segment' || $name === 'ignorable' ) && $this->unitContainsMda === false ) {
-                if ( isset( $this->transUnits[ $this->currentTransUnitId ] ) && !empty( $this->transUnits[ $this->currentTransUnitId ] ) && !$this->hasWrittenCounts ) {
+            if ($this->xliffVersion === 2 && ($name === 'notes' || $name === 'originalData' || $name === 'segment' || $name === 'ignorable') && $this->unitContainsMda === false) {
+                if (isset($this->transUnits[$this->currentTransUnitId]) && !empty($this->transUnits[$this->currentTransUnitId]) && !$this->hasWrittenCounts) {
 
                     // we need to update counts here
                     $this->updateCounts();
@@ -112,40 +112,40 @@ 
 
             $stateProp = null;
 
-            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 {
                     $pos = 0;
-                    if ( $this->currentTransUnitId and isset( $this->transUnits[ $this->currentTransUnitId ] ) ) {
-                        $pos = current( $this->transUnits[ $this->currentTransUnitId ] );
+                    if ($this->currentTransUnitId and isset($this->transUnits[$this->currentTransUnitId])) {
+                        $pos = current($this->transUnits[$this->currentTransUnitId]);
                     }
 
-                    if ( $name === $this->tuTagName and isset( $this->segments[ $pos ] ) and isset( $this->segments[ $pos ][ 'sid' ] ) ) {
+                    if ($name === $this->tuTagName and isset($this->segments[$pos]) and isset($this->segments[$pos]['sid'])) {
 
-                        $sid = $this->segments[ $pos ][ 'sid' ];
+                        $sid = $this->segments[$pos]['sid'];
 
                         // add `help-id` to xliff v.1*
                         // add `mtc:segment-id` to xliff v.2*
-                        if ( $this->xliffVersion === 1 && strpos( $tag, 'help-id' ) === false ) {
-                            if ( !empty( $sid ) ) {
+                        if ($this->xliffVersion === 1 && strpos($tag, 'help-id') === false) {
+                            if (!empty($sid)) {
                                 $tag .= "help-id=\"$sid\" ";
                             }
-                        } elseif ( $this->xliffVersion === 2 && strpos( $tag, 'mtc:segment-id' ) === false ) {
-                            if ( !empty( $sid ) ) {
+                        } elseif ($this->xliffVersion === 2 && strpos($tag, 'mtc:segment-id') === false) {
+                            if (!empty($sid)) {
                                 $tag .= "mtc:segment-id=\"$sid\" ";
                             }
                         }
 
-                    } elseif ( 'segment' === $name && $this->xliffVersion === 2 ) { // add state to segment in Xliff v2
-                        [ $stateProp, ] = StatusToStateAttribute::getState( $this->segments[ $pos ][ 'status' ], $this->xliffVersion );
+                    } elseif ('segment' === $name && $this->xliffVersion === 2) { // add state to segment in Xliff v2
+                        [$stateProp, ] = StatusToStateAttribute::getState($this->segments[$pos]['status'], $this->xliffVersion);
                     }
 
                     //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\" ";
                     }
 
@@ -154,33 +154,33 @@ 
             }
 
             // replace state for xliff v2
-            if ( $stateProp ) {
+            if ($stateProp) {
                 $tag .= $stateProp;
             }
 
             // add oasis xliff 20 namespace
-            if ( $this->xliffVersion === 2 && $name === 'xliff' && !array_key_exists( 'xmlns:mda', $attr ) ) {
+            if ($this->xliffVersion === 2 && $name === 'xliff' && !array_key_exists('xmlns:mda', $attr)) {
                 $tag .= 'xmlns:mda="urn:oasis:names:tc:xliff:metadata:2.0"';
             }
 
             // add MateCat specific namespace, we want maybe add non-XLIFF attributes
-            if ( $name === 'xliff' && !array_key_exists( 'xmlns:mtc', $attr ) ) {
+            if ($name === 'xliff' && !array_key_exists('xmlns:mtc', $attr)) {
                 $tag .= ' xmlns:mtc="https://www.matecat.com" ';
             }
 
             // trgLang
-            if ( $name === 'xliff' ) {
-                $tag = preg_replace( '/trgLang="(.*?)"/', 'trgLang="' . $this->targetLang . '"', $tag );
+            if ($name === 'xliff') {
+                $tag = preg_replace('/trgLang="(.*?)"/', 'trgLang="' . $this->targetLang . '"', $tag);
             }
 
-            $lastChar = $this->getLastCharacter( $parser );
+            $lastChar = $this->getLastCharacter($parser);
 
             //trim last space
-            $tag = rtrim( $tag );
+            $tag = rtrim($tag);
 
             //detect empty tag
-            $this->isEmpty = ( $lastChar == '/' || $name == 'x' );
-            if ( $this->isEmpty ) {
+            $this->isEmpty = ($lastChar == '/' || $name == 'x');
+            if ($this->isEmpty) {
                 $tag .= '/';
             }
 
@@ -188,29 +188,29 @@ 
             $tag .= ">";
 
             //set a a Buffer for the segSource Source tag
-            if ( $this->bufferIsActive || in_array( $name, $this->nodesToCopy ) ) { // we are opening a critical CDATA section
+            if ($this->bufferIsActive || in_array($name, $this->nodesToCopy)) { // we are opening a critical CDATA section
 
                 //WARNING BECAUSE SOURCE AND SEG-SOURCE TAGS CAN BE EMPTY IN SOME CASES!!!!!
                 //so check for isEmpty also in conjunction with name
-                if ( $this->isEmpty && ( 'source' === $name || 'seg-source' === $name ) ) {
-                    $this->postProcAndFlush( $this->outputFP, $tag );
+                if ($this->isEmpty && ('source' === $name || 'seg-source' === $name)) {
+                    $this->postProcAndFlush($this->outputFP, $tag);
                 } else {
                     //these are NOT source/seg-source/value empty tags, THERE IS A CONTENT, write it in buffer
                     $this->bufferIsActive = true;
-                    $this->CDATABuffer    .= $tag;
+                    $this->CDATABuffer .= $tag;
                 }
             } else {
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
             }
         }
 
         // update segmentPositionInTu
 
-        if ( $this->xliffVersion === 1 && $this->inTU && $name === 'source' ) {
+        if ($this->xliffVersion === 1 && $this->inTU && $name === 'source') {
             $this->segmentPositionInTu++;
         }
 
-        if ( $this->xliffVersion === 2 && $this->inTU && $name === 'segment' ) {
+        if ($this->xliffVersion === 2 && $this->inTU && $name === 'segment') {
             $this->segmentPositionInTu++;
         }
     }
@@ -218,7 +218,7 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagClose( $parser, $name ) {
+    protected function tagClose($parser, $name) {
         $tag = '';
 
         /**
@@ -227,26 +227,26 @@ 
          *
          * self::tagOpen method
          */
-        if ( !$this->isEmpty ) {
+        if (!$this->isEmpty) {
 
-            if ( !$this->inTarget ) {
+            if (!$this->inTarget) {
                 $tag = "</$name>";
             }
 
-            if ( 'target' == $name ) {
+            if ('target' == $name) {
 
-                if ( $this->currentTransUnitIsTranslatable === 'no' ) {
+                if ($this->currentTransUnitIsTranslatable === 'no') {
                     // do nothing
-                } elseif ( isset( $this->transUnits[ $this->currentTransUnitId ] ) ) {
+                } elseif (isset($this->transUnits[$this->currentTransUnitId])) {
 
                     // get translation of current segment, by indirect indexing: id -> positional index -> segment
                     // actually there may be more that one segment to that ID if there are two mrk of the same source segment
 
-                    $listOfSegmentsIds = $this->transUnits[ $this->currentTransUnitId ];
+                    $listOfSegmentsIds = $this->transUnits[$this->currentTransUnitId];
 
                     // $currentSegmentId
-                    if ( !empty( $listOfSegmentsIds ) ) {
-                        $this->setCurrentSegmentArray( $listOfSegmentsIds );
+                    if (!empty($listOfSegmentsIds)) {
+                        $this->setCurrentSegmentArray($listOfSegmentsIds);
                     }
 
                     /*
@@ -263,12 +263,12 @@ 
                     $this->lastTransUnit = [];
 
                     $last_value    = null;
-                    $segmentsCount = count( $listOfSegmentsIds );
-                    for ( $i = 0; $i < $segmentsCount; $i++ ) {
-                        $id = $listOfSegmentsIds[ $i ];
-                        if ( isset( $this->segments[ $id ] ) && ( $i == 0 || $last_value + 1 == $listOfSegmentsIds[ $i ] ) ) {
-                            $last_value            = $listOfSegmentsIds[ $i ];
-                            $this->lastTransUnit[] = $this->segments[ $id ];
+                    $segmentsCount = count($listOfSegmentsIds);
+                    for ($i = 0; $i < $segmentsCount; $i++) {
+                        $id = $listOfSegmentsIds[$i];
+                        if (isset($this->segments[$id]) && ($i == 0 || $last_value + 1 == $listOfSegmentsIds[$i])) {
+                            $last_value            = $listOfSegmentsIds[$i];
+                            $this->lastTransUnit[] = $this->segments[$id];
                         }
                     }
 
@@ -280,28 +280,28 @@ 
                     // we must reset the lastMrkId found because this is a new segment.
                     $lastMrkId = -1;
 
-                    if ( $this->xliffVersion === 2 ) {
-                        $seg = $this->segments[ $this->currentSegmentArray[ 'sid' ] ];
+                    if ($this->xliffVersion === 2) {
+                        $seg = $this->segments[$this->currentSegmentArray['sid']];
 
                         // 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 );
+                        $translation = $this->prepareTranslation($seg, $translation);
 
-                        [ $stateProp, ] = StatusToStateAttribute::getState( $seg[ 'status' ], $this->xliffVersion );
+                        [$stateProp, ] = StatusToStateAttribute::getState($seg['status'], $this->xliffVersion);
 
                     } else {
-                        foreach ( $listOfSegmentsIds as $pos => $id ) {
+                        foreach ($listOfSegmentsIds as $pos => $id) {
 
                             /*
                              * This routine works to respect the positional orders of markers.
@@ -314,8 +314,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)$this->segments[ $id ][ "mrk_id" ] < 0 && $this->segments[ $id ][ "mrk_id" ] !== null ) {
-                                $this->segments[ $id ][ "mrk_id" ] = 0;
+                            if ((int)$this->segments[$id]["mrk_id"] < 0 && $this->segments[$id]["mrk_id"] !== null) {
+                                $this->segments[$id]["mrk_id"] = 0;
                             }
 
                             /*
@@ -324,62 +324,62 @@ 
                              * ( null <= -1 ) === true
                              * so, cast to int
                              */
-                            if ( (int)$this->segments[ $id ][ "mrk_id" ] <= $lastMrkId ) {
+                            if ((int)$this->segments[$id]["mrk_id"] <= $lastMrkId) {
                                 break;
                             }
 
                             // set $this->currentSegment
-                            $seg = $this->segments[ $id ];
+                            $seg = $this->segments[$id];
 
                             // 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);
 
                             // for xliff 2 we need $this->transUnits[ $this->currentId ] [ $pos ] for populating metadata
 
-                            unset( $this->transUnits[ $this->currentTransUnitId ] [ $pos ] );
+                            unset($this->transUnits[$this->currentTransUnitId] [$pos]);
 
-                            $lastMrkId = $this->segments[ $id ][ "mrk_id" ];
+                            $lastMrkId = $this->segments[$id]["mrk_id"];
 
-                            [ $stateProp, $lastMrkState ] = StatusToStateAttribute::getState( $seg[ 'status' ], $this->xliffVersion, $stateProp, $lastMrkState );
+                            [$stateProp, $lastMrkState] = StatusToStateAttribute::getState($seg['status'], $this->xliffVersion, $stateProp, $lastMrkState);
 
                         }
                     }
 
                     //append translation
-                    $tag = $this->createTargetTag( $translation, $stateProp );
+                    $tag = $this->createTargetTag($translation, $stateProp);
 
                 }
 
                 // signal we are leaving a target
                 $this->targetWasWritten = true;
                 $this->inTarget         = false;
-                $this->postProcAndFlush( $this->outputFP, $tag, true );
-            } elseif ( in_array( $name, $this->nodesToCopy ) && !$this->inTarget ) { // we are closing a critical CDATA section
+                $this->postProcAndFlush($this->outputFP, $tag, true);
+            } elseif (in_array($name, $this->nodesToCopy) && !$this->inTarget) { // 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->xliffVersion === 2 && !$this->hasWrittenCounts ) {
+                if ('mda:metadata' === $name && $this->unitContainsMda && $this->xliffVersion === 2 && !$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 {
@@ -389,22 +389,22 @@ 
                 $this->CDATABuffer = "";
 
                 //flush to pointer
-                $this->postProcAndFlush( $this->outputFP, $tag );
-            } elseif ( 'segment' === $name ) {
+                $this->postProcAndFlush($this->outputFP, $tag);
+            } 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 );
-                        [ $stateProp, ] = StatusToStateAttribute::getState( $seg[ 'status' ], $this->xliffVersion );
+                        $translation = $this->prepareTranslation($seg);
+                        [$stateProp, ] = StatusToStateAttribute::getState($seg['status'], $this->xliffVersion);
 
                         // replace the tag
-                        $tag = $this->createTargetTag( $translation, $stateProp );
+                        $tag = $this->createTargetTag($translation, $stateProp);
 
                         $tag .= '</segment>';
 
@@ -412,46 +412,46 @@ 
 
                 }
 
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
 
                 // we are leaving <segment>, reset $segmentHasTarget
                 $this->targetWasWritten = false;
 
-            } elseif ( $name === 'trans-unit' ) {
+            } elseif ($name === 'trans-unit') {
 
                 // only for Xliff 1.*
                 // handling </trans-unit> closure
-                if ( !$this->targetWasWritten ) {
+                if (!$this->targetWasWritten) {
 
                     $seg = $this->getCurrentSegment();
 
-                    if ( isset( $seg[ 'translation' ] ) ) {
-                        $translation = $this->prepareTranslation( $seg );
-                        [ $stateProp, ] = StatusToStateAttribute::getState( $seg[ 'status' ], $this->xliffVersion );
+                    if (isset($seg['translation'])) {
+                        $translation = $this->prepareTranslation($seg);
+                        [$stateProp, ] = StatusToStateAttribute::getState($seg['status'], $this->xliffVersion);
 
                         // replace the tag
-                        $tag = $this->createTargetTag( $translation, $stateProp );
+                        $tag = $this->createTargetTag($translation, $stateProp);
                         $tag .= '</trans-unit>';
 
                     }
 
-                    $this->postProcAndFlush( $this->outputFP, $tag );
+                    $this->postProcAndFlush($this->outputFP, $tag);
 
                 } else {
-                    $this->postProcAndFlush( $this->outputFP, '</trans-unit>' );
+                    $this->postProcAndFlush($this->outputFP, '</trans-unit>');
                     $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 ( $this->CDATABuffer === '<note/>' && $this->bufferIsActive === true ) {
-            $this->postProcAndFlush( $this->outputFP, '<note/>' );
+        } elseif ($this->CDATABuffer === '<note/>' && $this->bufferIsActive === true) {
+            $this->postProcAndFlush($this->outputFP, '<note/>');
             $this->bufferIsActive = false;
             $this->CDATABuffer    = '';
             $this->isEmpty        = false;
@@ -461,7 +461,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->segmentPositionInTu       = -1;
@@ -478,20 +478,20 @@ 
      *
      * @param array $listOfSegmentsIds
      */
-    private function setCurrentSegmentArray( array $listOfSegmentsIds = [] ) {
+    private function setCurrentSegmentArray(array $listOfSegmentsIds = []) {
         // $currentSegmentId
-        if ( empty( $this->currentSegmentArray ) ) {
+        if (empty($this->currentSegmentArray)) {
             $this->currentSegmentArray = [
-                    'sid' => $listOfSegmentsIds[ 0 ],
+                    'sid' => $listOfSegmentsIds[0],
                     'tid' => $this->currentTransUnitId,
             ];
         } else {
-            if ( $this->currentSegmentArray[ 'tid' ] === $this->currentTransUnitId ) {
-                $key                                = array_search( $this->currentSegmentArray[ 'sid' ], $listOfSegmentsIds );
-                $this->currentSegmentArray[ 'sid' ] = $listOfSegmentsIds[ $key + 1 ];
+            if ($this->currentSegmentArray['tid'] === $this->currentTransUnitId) {
+                $key                                = array_search($this->currentSegmentArray['sid'], $listOfSegmentsIds);
+                $this->currentSegmentArray['sid'] = $listOfSegmentsIds[$key + 1];
             } else {
                 $this->currentSegmentArray = [
-                        'sid' => $listOfSegmentsIds[ 0 ],
+                        'sid' => $listOfSegmentsIds[0],
                         'tid' => $this->currentTransUnitId,
                 ];
             }
@@ -503,23 +503,23 @@ 
      */
     private function updateCounts() {
         // populate counts
-        $listOfSegmentsIds = $this->transUnits[ $this->currentTransUnitId ];
+        $listOfSegmentsIds = $this->transUnits[$this->currentTransUnitId];
 
         // $currentSegmentId
-        if ( !empty( $listOfSegmentsIds ) ) {
-            $this->setCurrentSegmentArray( $listOfSegmentsIds );
+        if (!empty($listOfSegmentsIds)) {
+            $this->setCurrentSegmentArray($listOfSegmentsIds);
         }
 
-        if ( $this->xliffVersion === 2 ) {
-            $seg = $this->segments[ $this->currentSegmentArray[ 'sid' ] ];
-            if ( !empty( $seg ) ) {
-                $this->updateSegmentCounts( $seg );
+        if ($this->xliffVersion === 2) {
+            $seg = $this->segments[$this->currentSegmentArray['sid']];
+            if (!empty($seg)) {
+                $this->updateSegmentCounts($seg);
             }
         } else {
-            foreach ( $listOfSegmentsIds as $pos => $id ) {
-                $seg = $this->segments[ $id ];
-                if ( !empty( $seg ) ) {
-                    $this->updateSegmentCounts( $seg );
+            foreach ($listOfSegmentsIds as $pos => $id) {
+                $seg = $this->segments[$id];
+                if (!empty($seg)) {
+                    $this->updateSegmentCounts($seg);
                 }
             }
         }
@@ -530,24 +530,24 @@ 
     /**
      * @param array $seg
      */
-    private function updateSegmentCounts( array $seg = [] ) {
+    private function updateSegmentCounts(array $seg = []) {
 
-        $raw_word_count = $seg[ 'raw_word_count' ];
-        $eq_word_count  = ( floor( $seg[ 'eq_word_count' ] * 100 ) / 100 );
+        $raw_word_count = $seg['raw_word_count'];
+        $eq_word_count  = (floor($seg['eq_word_count'] * 100) / 100);
 
-        $this->counts[ 'segments_count_array' ][ $seg[ 'sid' ] ] = [
+        $this->counts['segments_count_array'][$seg['sid']] = [
                 'raw_word_count' => $raw_word_count,
                 'eq_word_count'  => $eq_word_count,
         ];
 
-        $this->counts[ 'raw_word_count' ] += $raw_word_count;
-        $this->counts[ 'eq_word_count' ]  += $eq_word_count;
+        $this->counts['raw_word_count'] += $raw_word_count;
+        $this->counts['eq_word_count']  += $eq_word_count;
     }
 
     private function resetCounts() {
-        $this->counts[ 'segments_count_array' ] = [];
-        $this->counts[ 'raw_word_count' ]       = 0;
-        $this->counts[ 'eq_word_count' ]        = 0;
+        $this->counts['segments_count_array'] = [];
+        $this->counts['raw_word_count']       = 0;
+        $this->counts['eq_word_count']        = 0;
     }
 
     /**
@@ -558,38 +558,38 @@ 
      *
      * @return string
      */
-    protected function prepareTranslation( $seg, $transUnitTranslation = "" ) {
+    protected function prepareTranslation($seg, $transUnitTranslation = "") {
         $endTags = "";
 
-        $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|||';
                 }
             }
         }
 
         // for xliff v2 we ignore the marks on purpose
-        if ( $this->xliffVersion === 2 ) {
+        if ($this->xliffVersion === 2) {
             return $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' ] . $translation . $seg[ 'mrk_succ_tags' ] . "</mrk>";
+            $translation = "<mrk mid=\"" . $seg['mrk_id'] . "\" mtype=\"seg\">" . $seg['mrk_prev_tags'] . $translation . $seg['mrk_succ_tags'] . "</mrk>";
         }
 
-        $transUnitTranslation .= $seg[ 'prev_tags' ] . $translation . $endTags . $seg[ 'succ_tags' ];
+        $transUnitTranslation .= $seg['prev_tags'] . $translation . $endTags . $seg['succ_tags'];
 
         return $transUnitTranslation;
     }
@@ -601,7 +601,7 @@ 
      *
      * @return string
      */
-    private function getWordCountGroup( $raw_word_count, $eq_word_count ) {
+    private function getWordCountGroup($raw_word_count, $eq_word_count) {
         return "\n<count-group name=\"$this->currentTransUnitId\"><count count-type=\"x-matecat-raw\">$raw_word_count</count><count count-type=\"x-matecat-weighted\">$eq_word_count</count></count-group>";
     }
 
@@ -609,11 +609,11 @@ 
      * @return array
      */
     private function getCurrentSegment() {
-        if ( $this->currentTransUnitIsTranslatable === 'yes' && isset( $this->transUnits[ $this->currentTransUnitId ] ) ) {
-            $index = $this->transUnits[ $this->currentTransUnitId ][ $this->segmentPositionInTu ];
+        if ($this->currentTransUnitIsTranslatable === 'yes' && isset($this->transUnits[$this->currentTransUnitId])) {
+            $index = $this->transUnits[$this->currentTransUnitId][$this->segmentPositionInTu];
 
-            if ( isset( $this->segments[ $index ] ) ) {
-                return $this->segments[ $index ];
+            if (isset($this->segments[$index])) {
+                return $this->segments[$index];
             }
         }
 
@@ -628,21 +628,21 @@ 
      *
      * @return string
      */
-    private function createTargetTag( $translation, $stateProp ) {
+    private function createTargetTag($translation, $stateProp) {
 
         $targetLang = '';
-        if ( $this->xliffVersion === 1 ) {
+        if ($this->xliffVersion === 1) {
             $targetLang = ' xml:lang="' . $this->targetLang . '"';
         }
 
-        switch ( $this->xliffVersion ) {
+        switch ($this->xliffVersion) {
             case 1:
             default:
                 $tag = "<target $targetLang $stateProp>$translation</target>";
 
                 // if it's a Trados file don't append count group
-                if ( get_class( $this ) !== oldSdlOldXliffSAXTranslationReplacer::class ) {
-                    $tag .= $this->getWordCountGroup( $this->counts[ 'raw_word_count' ], $this->counts[ 'eq_word_count' ] );
+                if (get_class($this) !== oldSdlOldXliffSAXTranslationReplacer::class) {
+                    $tag .= $this->getWordCountGroup($this->counts['raw_word_count'], $this->counts['eq_word_count']);
                 }
 
                 return $tag;
@@ -658,33 +658,33 @@ 
      *
      * @return string
      */
-    private function getWordCountGroupForXliffV2( $withMetadataTag = true ) {
+    private function getWordCountGroupForXliffV2($withMetadataTag = true) {
 
         $this->mdaGroupCounter++;
-        $segments_count_array = $this->counts[ 'segments_count_array' ];
+        $segments_count_array = $this->counts['segments_count_array'];
 
         $id = $this->currentSegmentArray;
 
 
         $return = '';
 
-        if ( $withMetadataTag === true ) {
+        if ($withMetadataTag === true) {
             $return .= '<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++;
 
             $return .= "    <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) {
             $return .= '</mda:metadata>';
         }
 

src/XliffReplacer/StatusToStateAttribute.php

Spacing +14 added lines, -14 removed lines

@@ -22,26 +22,26 @@ 
      *
      * @return array
      */
-    public static function getState( string $status, int $xliffVersion, ?string $state_prop = '', ?string $lastMrkState = '' ): array {
+    public static function getState(string $status, int $xliffVersion, ?string $state_prop = '', ?string $lastMrkState = ''): array {
 
-        switch ( $status ) {
+        switch ($status) {
 
             case TranslationStatus::STATUS_FIXED:
             case TranslationStatus::STATUS_APPROVED2:
-                if ( $lastMrkState == null || $lastMrkState == TranslationStatus::STATUS_APPROVED2 ) {
+                if ($lastMrkState == null || $lastMrkState == TranslationStatus::STATUS_APPROVED2) {
                     $state_prop   = "state=\"final\"";
                     $lastMrkState = TranslationStatus::STATUS_APPROVED2;
                 }
                 break;
             case TranslationStatus::STATUS_APPROVED:
-                if ( $lastMrkState == null || $lastMrkState == TranslationStatus::STATUS_APPROVED ) {
-                    $state_prop   = ( $xliffVersion === 2 ) ? "state=\"reviewed\"" : "state=\"signed-off\"";
+                if ($lastMrkState == null || $lastMrkState == TranslationStatus::STATUS_APPROVED) {
+                    $state_prop   = ($xliffVersion === 2) ? "state=\"reviewed\"" : "state=\"signed-off\"";
                     $lastMrkState = TranslationStatus::STATUS_APPROVED;
                 }
                 break;
 
             case TranslationStatus::STATUS_TRANSLATED:
-                if ( $lastMrkState == null || $lastMrkState == TranslationStatus::STATUS_TRANSLATED || $lastMrkState == TranslationStatus::STATUS_APPROVED ) {
+                if ($lastMrkState == null || $lastMrkState == TranslationStatus::STATUS_TRANSLATED || $lastMrkState == TranslationStatus::STATUS_APPROVED) {
                     $state_prop   = "state=\"translated\"";
                     $lastMrkState = TranslationStatus::STATUS_TRANSLATED;
                 }
@@ -49,22 +49,22 @@ 
 
             case TranslationStatus::STATUS_REJECTED:  // if there is a mark REJECTED and there is not a DRAFT, all the trans-unit is REJECTED. In V2 there is no way to mark
             case TranslationStatus::STATUS_REBUTTED:
-                if ( ( $lastMrkState == null ) || ( $lastMrkState != TranslationStatus::STATUS_NEW || $lastMrkState != TranslationStatus::STATUS_DRAFT ) ) {
-                    $state_prop   = ( $xliffVersion === 2 ) ? "state=\"initial\"" : "state=\"needs-review-translation\"";
+                if (($lastMrkState == null) || ($lastMrkState != TranslationStatus::STATUS_NEW || $lastMrkState != TranslationStatus::STATUS_DRAFT)) {
+                    $state_prop   = ($xliffVersion === 2) ? "state=\"initial\"" : "state=\"needs-review-translation\"";
                     $lastMrkState = TranslationStatus::STATUS_REJECTED;
                 }
                 break;
 
             case TranslationStatus::STATUS_NEW:
-                if ( ( $lastMrkState == null ) || $lastMrkState != TranslationStatus::STATUS_NEW ) {
-                    $state_prop   = ( $xliffVersion === 2 ) ? "state=\"initial\"" : "state=\"new\"";
+                if (($lastMrkState == null) || $lastMrkState != TranslationStatus::STATUS_NEW) {
+                    $state_prop   = ($xliffVersion === 2) ? "state=\"initial\"" : "state=\"new\"";
                     $lastMrkState = TranslationStatus::STATUS_NEW;
                 }
                 break;
 
             case TranslationStatus::STATUS_DRAFT:
-                if ( ( $lastMrkState == null ) || $lastMrkState != TranslationStatus::STATUS_DRAFT ) {
-                    $state_prop   = ( $xliffVersion === 2 ) ? "state=\"initial\"" : "state=\"new\"";
+                if (($lastMrkState == null) || $lastMrkState != TranslationStatus::STATUS_DRAFT) {
+                    $state_prop   = ($xliffVersion === 2) ? "state=\"initial\"" : "state=\"new\"";
                     $lastMrkState = TranslationStatus::STATUS_DRAFT;
                 }
                 break;
@@ -73,7 +73,7 @@ 
                 // this is the case when a segment is not showed in cattool, so the row in
                 // segment_translations does not exists and
                 // ---> $seg[ 'status' ] is NULL
-                if ( $lastMrkState == null ) { //this is the first MRK ID
+                if ($lastMrkState == null) { //this is the first MRK ID
                     $state_prop   = "state=\"translated\"";
                     $lastMrkState = TranslationStatus::STATUS_TRANSLATED;
                 } else {
@@ -82,7 +82,7 @@ 
                 break;
         }
 
-        return [ $state_prop, $lastMrkState ];
+        return [$state_prop, $lastMrkState];
 
     }
 

src/XliffReplacer/old__SdlXliffSAXTranslationReplacer.php

Spacing +47 added lines, -47 removed lines

@@ -10,22 +10,22 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagOpen( $parser, $name, $attr ) {
+    protected function tagOpen($parser, $name, $attr) {
         // check if we are entering into a <trans-unit> (xliff v1.*) or <unit> (xliff v2.*)
-        if ( $this->tuTagName === $name ) {
+        if ($this->tuTagName === $name) {
             $this->inTU = true;
 
             // get id
             // trim to first 100 characters because this is the limit on Matecat's DB
-            $this->currentTransUnitId = substr( $attr[ 'id' ], 0, 100 );
+            $this->currentTransUnitId = substr($attr['id'], 0, 100);
 
             // current 'translate' attribute of the current trans-unit
-            $this->currentTransUnitIsTranslatable = isset( $attr[ 'translate' ] ) ? $attr[ 'translate' ] : 'yes';
+            $this->currentTransUnitIsTranslatable = isset($attr['translate']) ? $attr['translate'] : 'yes';
         }
 
         // check if we are entering into a <target>
-        if ( 'target' == $name ) {
-            if ( $this->currentTransUnitIsTranslatable === 'no' ) {
+        if ('target' == $name) {
+            if ($this->currentTransUnitIsTranslatable === 'no') {
                 $this->inTarget = false;
             } else {
                 $this->inTarget = true;
@@ -33,13 +33,13 @@ 
         }
 
         // reset Marker positions
-        if ( 'sdl:seg-defs' == $name ) {
+        if ('sdl:seg-defs' == $name) {
             $this->segmentInUnitPosition = 0;
         }
 
         // 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 ";
@@ -49,23 +49,23 @@ 
             // 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\" ";
 
-                    if ( null !== $this->logger ) {
-                        $this->logger->debug( $k . " => " . $this->targetLang );
+                    if (null !== $this->logger) {
+                        $this->logger->debug($k . " => " . $this->targetLang);
                     }
-                } elseif ( 'sdl:seg' == $name ) {
+                } elseif ('sdl:seg' == $name) {
 
                     // write the confidence level for this segment ( Translated, Draft, etc. )
-                    if ( isset( $this->segments[ 'matecat|' . $this->currentTransUnitId ] ) && $_sdlStatus_confWritten === false ) {
+                    if (isset($this->segments['matecat|' . $this->currentTransUnitId]) && $_sdlStatus_confWritten === false) {
 
                         // append definition attribute
-                        $tag .= $this->prepareTargetStatuses( $this->lastTransUnit[ $this->segmentInUnitPosition ] );
+                        $tag .= $this->prepareTargetStatuses($this->lastTransUnit[$this->segmentInUnitPosition]);
 
                         //prepare for an eventual next cycle
                         $this->segmentInUnitPosition++;
@@ -73,7 +73,7 @@ 
                     }
 
                     // 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\" ";
                     }
@@ -86,29 +86,29 @@ 
             // this logic helps detecting empty tags
             // get current position of SAX pointer in all the stream of data is has read so far:
             // it points at the end of current tag
-            $idx = xml_get_current_byte_index( $parser );
+            $idx = xml_get_current_byte_index($parser);
 
             // check whether the bounds of current tag are entirely in current buffer || the end of the current tag
             // is outside current buffer (in the latter case, it's in next buffer to be read by the while loop);
             // this check is necessary because we may have truncated a tag in half with current read,
             // and the other half may be encountered in the next buffer it will be passed
-            if ( isset( $this->currentBuffer[ $idx - $this->offset ] ) ) {
+            if (isset($this->currentBuffer[$idx - $this->offset])) {
                 // if this tag entire lenght fitted in the buffer, the last char must be the last
                 // symbol before the '>'; if it's an empty tag, it is assumed that it's a '/'
                 $tmp_offset = $idx - $this->offset;
-                $lastChar   = $this->currentBuffer[ $tmp_offset ];
+                $lastChar   = $this->currentBuffer[$tmp_offset];
             } else {
                 //if it's out, simple use the last character of the chunk
                 $tmp_offset = $this->len - 1;
-                $lastChar   = $this->currentBuffer[ $tmp_offset ];
+                $lastChar   = $this->currentBuffer[$tmp_offset];
             }
 
             // trim last space
-            $tag = rtrim( $tag );
+            $tag = rtrim($tag);
 
             // detect empty tag
-            $this->isEmpty = ( $lastChar == '/' || $name == 'x' );
-            if ( $this->isEmpty ) {
+            $this->isEmpty = ($lastChar == '/' || $name == 'x');
+            if ($this->isEmpty) {
                 $tag .= '/';
             }
 
@@ -116,7 +116,7 @@ 
             $tag .= ">";
 
             // set a a Buffer for the segSource Source tag
-            if ( 'source' == $name
+            if ('source' == $name
                     || 'seg-source' === $name
                     || $this->bufferIsActive
                     || 'value' === $name
@@ -125,19 +125,19 @@ 
                     || 'ph' === $name
                     || 'st' === $name
                     || 'note' === $name
-                    || 'context' === $name ) { // we are opening a critical CDATA section
+                    || 'context' === $name) { // we are opening a critical CDATA section
 
                 // WARNING BECAUSE SOURCE AND SEG-SOURCE TAGS CAN BE EMPTY IN SOME CASES!!!!!
                 // so check for isEmpty also in conjunction with name
-                if ( $this->isEmpty && ( 'source' == $name || 'seg-source' == $name ) ) {
-                    $this->postProcAndFlush( $this->outputFP, $tag );
+                if ($this->isEmpty && ('source' == $name || 'seg-source' == $name)) {
+                    $this->postProcAndFlush($this->outputFP, $tag);
                 } else {
                     //these are NOT source/seg-source/value empty tags, THERE IS A CONTENT, write it in buffer
                     $this->bufferIsActive = true;
-                    $this->CDATABuffer    .= $tag;
+                    $this->CDATABuffer .= $tag;
                 }
             } else {
-                $this->postProcAndFlush( $this->outputFP, $tag );
+                $this->postProcAndFlush($this->outputFP, $tag);
             }
         }
     }
@@ -150,19 +150,19 @@ 
      *
      * @return string
      */
-    protected function prepareTranslation( $seg, $transUnitTranslation = "" ) {
+    protected function prepareTranslation($seg, $transUnitTranslation = "") {
         $endTags = "";
 
-        $segment     = Strings::removeDangerousChars( $seg [ 'segment' ] );
-        $translation = Strings::removeDangerousChars( $seg [ 'translation' ] );
-        $dataRefMap  = ( isset( $seg[ 'data_ref_map' ] ) && $seg[ 'data_ref_map' ] !== null ) ? Strings::jsonToArray( $seg[ 'data_ref_map' ] ) : [];
+        $segment     = Strings::removeDangerousChars($seg ['segment']);
+        $translation = Strings::removeDangerousChars($seg ['translation']);
+        $dataRefMap  = (isset($seg['data_ref_map']) && $seg['data_ref_map'] !== null) ? Strings::jsonToArray($seg['data_ref_map']) : [];
 
-        if ( is_null( $seg [ 'translation' ] ) || $seg [ 'translation' ] == '' ) {
+        if (is_null($seg ['translation']) || $seg ['translation'] == '') {
             $translation = $segment;
         } else {
-            if ( $this->callback instanceof XliffReplacerCallbackInterface ) {
+            if ($this->callback instanceof XliffReplacerCallbackInterface) {
                 $error = (isset($seg['error'])) ? $seg['error'] : null;
-                if ( $this->callback->thereAreErrors( $seg[ 'sid' ], $segment, $translation, $dataRefMap, $error ) ) {
+                if ($this->callback->thereAreErrors($seg['sid'], $segment, $translation, $dataRefMap, $error)) {
                     $translation = '|||UNTRANSLATED_CONTENT_START|||' . $segment . '|||UNTRANSLATED_CONTENT_END|||';
                 }
             }
@@ -171,20 +171,20 @@ 
         // for Trados the trailing spaces after </mrk> are meaningful
         // so we trim the translation from Matecat DB and add them after </mrk>
         $trailingSpaces = '';
-        for ( $s = 0; $s < Strings::getTheNumberOfTrailingSpaces( $translation ); $s++ ) {
+        for ($s = 0; $s < Strings::getTheNumberOfTrailingSpaces($translation); $s++) {
             $trailingSpaces .= ' ';
         }
 
-        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;
         }
 
         // we need to trim succ_tags here because we already added the trailing spaces after </mrk>
-        $transUnitTranslation .= $seg[ 'prev_tags' ] . $translation . $endTags . ltrim( $seg[ 'succ_tags' ] );
+        $transUnitTranslation .= $seg['prev_tags'] . $translation . $endTags . ltrim($seg['succ_tags']);
 
         return $transUnitTranslation;
     }
@@ -194,7 +194,7 @@ 
      *
      * @return string
      */
-    protected function prepareTargetStatuses( $segment ) {
+    protected function prepareTargetStatuses($segment) {
         $statusMap = [
                 'NEW'        => '',
                 'DRAFT'      => 'Draft',
@@ -203,7 +203,7 @@ 
                 'REJECTED'   => 'RejectedTranslation',
         ];
 
-        return "conf=\"{$statusMap[ $segment[ 'status' ] ]}\" ";
+        return "conf=\"{$statusMap[$segment['status']]}\" ";
     }
 
     /**
@@ -213,8 +213,8 @@ 
      *
      * @return array
      */
-    protected function setTransUnitState( $seg, $state_prop, $lastMrkState ) {
-        return [ null, null ];
+    protected function setTransUnitState($seg, $state_prop, $lastMrkState) {
+        return [null, null];
     }
 
     /**
@@ -223,7 +223,7 @@ 
      *
      * @return string
      */
-    protected function getWordCountGroup( $raw_word_count, $eq_word_count ) {
+    protected function getWordCountGroup($raw_word_count, $eq_word_count) {
         return '';
     }
 }

src/XliffReplacer/XliffSdl.php

Spacing +21 added lines, -21 removed lines

@@ -16,13 +16,13 @@ 
     /**
      * @inheritDoc
      */
-    protected function tagOpen( $parser, $name, $attr ) {
+    protected function tagOpen($parser, $name, $attr) {
 
-        $this->handleOpenUnit( $name, $attr );
+        $this->handleOpenUnit($name, $attr);
 
         // check if we are entering into a <target>
-        if ( 'target' == $name ) {
-            if ( $this->currentTransUnitIsTranslatable === 'no' ) {
+        if ('target' == $name) {
+            if ($this->currentTransUnitIsTranslatable === 'no') {
                 $this->inTarget = false;
             } else {
                 $this->inTarget = true;
@@ -30,18 +30,18 @@ 
         }
 
         // reset Marker positions
-        if ( 'sdl:seg-defs' == $name ) {
+        if ('sdl:seg-defs' == $name) {
             $this->segmentInUnitPosition = 0;
         }
 
         // open buffer
-        if ( in_array( $name, $this->nodesToBuffer ) ) {
+        if (in_array($name, $this->nodesToBuffer)) {
             $this->bufferIsActive = true;
         }
 
         // 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 ";
@@ -51,16 +51,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\" ";
                     }
@@ -69,11 +69,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);
 
         }
 
@@ -84,7 +84,7 @@ 
      *
      * @return string
      */
-    protected function prepareTargetStatuses( $segment ): string {
+    protected function prepareTargetStatuses($segment): string {
         $statusMap = [
                 'NEW'        => '',
                 'DRAFT'      => 'Draft',
@@ -93,22 +93,22 @@ 
                 '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 = '';
-        for ( $s = 0; $s < Strings::getTheNumberOfTrailingSpaces( $translation ); $s++ ) {
+        for ($s = 0; $s < Strings::getTheNumberOfTrailingSpaces($translation); $s++) {
             $trailingSpaces .= ' ';
         }
 
-        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;