matecat / xliff-parser

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/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/XliffUtils/XliffProprietaryDetect.php

Spacing +55 added lines, -55 removed lines

@@ -22,11 +22,11 @@ 
      *
      * @return array
      */
-    public static function getInfoFromXliffContent( string $xliffContent ): array {
+    public static function getInfoFromXliffContent(string $xliffContent): array {
         self::reset();
-        $tmp = self::getFirst1024CharsFromXliff( $xliffContent );
+        $tmp = self::getFirst1024CharsFromXliff($xliffContent);
 
-        return self::getInfoFromTmp( $tmp );
+        return self::getInfoFromTmp($tmp);
     }
 
     /**
@@ -34,12 +34,12 @@ 
      *
      * @return array
      */
-    public static function getInfo( string $fullPathToFile ): array {
+    public static function getInfo(string $fullPathToFile): array {
         self::reset();
-        $tmp                      = self::getFirst1024CharsFromXliff( null, $fullPathToFile );
-        self::$fileType[ 'info' ] = Files::pathInfo( $fullPathToFile );
+        $tmp                      = self::getFirst1024CharsFromXliff(null, $fullPathToFile);
+        self::$fileType['info'] = Files::pathInfo($fullPathToFile);
 
-        return self::getInfoFromTmp( $tmp );
+        return self::getInfoFromTmp($tmp);
     }
 
     /**
@@ -47,21 +47,21 @@ 
      *
      * @return array
      */
-    private static function getInfoFromTmp( array $tmp ): array {
+    private static function getInfoFromTmp(array $tmp): array {
         try {
-            self::checkVersion( $tmp );
-        } catch ( Exception $ignore ) {
+            self::checkVersion($tmp);
+        } catch (Exception $ignore) {
             // do nothing
             // self::$fileType[ 'version' ] is left empty
         }
 
         // run CheckXliffProprietaryPipeline
-        $pipeline = self::runPipeline( $tmp );
+        $pipeline = self::runPipeline($tmp);
 
-        self::$fileType[ 'proprietary' ]            = $pipeline[ 'proprietary' ];
-        self::$fileType[ 'proprietary_name' ]       = $pipeline[ 'proprietary_name' ];
-        self::$fileType[ 'proprietary_short_name' ] = $pipeline[ 'proprietary_short_name' ];
-        self::$fileType[ 'converter_version' ]      = $pipeline[ 'converter_version' ];
+        self::$fileType['proprietary']            = $pipeline['proprietary'];
+        self::$fileType['proprietary_name']       = $pipeline['proprietary_name'];
+        self::$fileType['proprietary_short_name'] = $pipeline['proprietary_short_name'];
+        self::$fileType['converter_version']      = $pipeline['converter_version'];
 
         return self::$fileType;
     }
@@ -71,12 +71,12 @@ 
      *
      * @return array
      */
-    private static function runPipeline( ?array $tmp = [] ): array {
-        $pipeline = new CheckXliffProprietaryPipeline( $tmp );
-        $pipeline->addCheck( new CheckSDL() );
-        $pipeline->addCheck( new CheckGlobalSight() );
-        $pipeline->addCheck( new CheckMateCATConverter() );
-        $pipeline->addCheck( new CheckXliffVersion2() );
+    private static function runPipeline(?array $tmp = []): array {
+        $pipeline = new CheckXliffProprietaryPipeline($tmp);
+        $pipeline->addCheck(new CheckSDL());
+        $pipeline->addCheck(new CheckGlobalSight());
+        $pipeline->addCheck(new CheckMateCATConverter());
+        $pipeline->addCheck(new CheckXliffVersion2());
 
         return $pipeline->run();
     }
@@ -98,9 +98,9 @@ 
      *
      * @return string
      */
-    private static function getFirst1024CharsFromString( ?string $stringData ): string {
-        if ( !empty( $stringData ) ) {
-            return substr( $stringData, 0, 1024 );
+    private static function getFirst1024CharsFromString(?string $stringData): string {
+        if (!empty($stringData)) {
+            return substr($stringData, 0, 1024);
         }
 
         return '';
@@ -111,13 +111,13 @@ 
      *
      * @return string
      */
-    private static function getFirst1024CharsFromFile( ?string $fullPathToFile ): string {
+    private static function getFirst1024CharsFromFile(?string $fullPathToFile): string {
         $stringData = '';
-        if ( !empty( $fullPathToFile ) && is_file( $fullPathToFile ) ) {
-            $file_pointer = fopen( "$fullPathToFile", 'r' );
+        if (!empty($fullPathToFile) && is_file($fullPathToFile)) {
+            $file_pointer = fopen("$fullPathToFile", 'r');
             // Checking Requirements (By specs, I know that xliff version is in the first 1KB)
-            $stringData = fread( $file_pointer, 1024 );
-            fclose( $file_pointer );
+            $stringData = fread($file_pointer, 1024);
+            fclose($file_pointer);
         }
 
         return $stringData;
@@ -130,13 +130,13 @@ 
      *
      * @return string[]
      */
-    private static function getFirst1024CharsFromXliff( ?string $stringData = null, string $fullPathToFile = null ): ?array {
-        $stringData = static::getFirst1024CharsFromString( $stringData );
-        if ( empty( $stringData ) ) {
-            $stringData = static::getFirst1024CharsFromFile( $fullPathToFile );
+    private static function getFirst1024CharsFromXliff(?string $stringData = null, string $fullPathToFile = null): ?array {
+        $stringData = static::getFirst1024CharsFromString($stringData);
+        if (empty($stringData)) {
+            $stringData = static::getFirst1024CharsFromFile($fullPathToFile);
         }
 
-        return !empty( $stringData ) ? [ $stringData ] : [];
+        return !empty($stringData) ? [$stringData] : [];
     }
 
     /**
@@ -145,9 +145,9 @@ 
      * @throws NotSupportedVersionException
      * @throws NotValidFileException
      */
-    protected static function checkVersion( array $tmp ) {
-        if ( isset( $tmp[ 0 ] ) ) {
-            self::$fileType[ 'version' ] = XliffVersionDetector::detect( $tmp[ 0 ] );
+    protected static function checkVersion(array $tmp) {
+        if (isset($tmp[0])) {
+            self::$fileType['version'] = XliffVersionDetector::detect($tmp[0]);
         }
     }
 
@@ -158,20 +158,20 @@ 
      * @throws NotSupportedVersionException
      * @throws NotValidFileException
      */
-    public static function getInfoByStringData( string $stringData ): array {
+    public static function getInfoByStringData(string $stringData): array {
         self::reset();
 
-        $tmp                      = self::getFirst1024CharsFromXliff( $stringData );
-        self::$fileType[ 'info' ] = [];
-        self::checkVersion( $tmp );
+        $tmp                      = self::getFirst1024CharsFromXliff($stringData);
+        self::$fileType['info'] = [];
+        self::checkVersion($tmp);
 
         // run CheckXliffProprietaryPipeline
-        $pipeline = self::runPipeline( $tmp );
+        $pipeline = self::runPipeline($tmp);
 
-        self::$fileType[ 'proprietary' ]            = $pipeline[ 'proprietary' ];
-        self::$fileType[ 'proprietary_name' ]       = $pipeline[ 'proprietary_name' ];
-        self::$fileType[ 'proprietary_short_name' ] = $pipeline[ 'proprietary_short_name' ];
-        self::$fileType[ 'converter_version' ]      = $pipeline[ 'converter_version' ];
+        self::$fileType['proprietary']            = $pipeline['proprietary'];
+        self::$fileType['proprietary_name']       = $pipeline['proprietary_name'];
+        self::$fileType['proprietary_short_name'] = $pipeline['proprietary_short_name'];
+        self::$fileType['converter_version']      = $pipeline['converter_version'];
 
         return self::$fileType;
     }
@@ -183,33 +183,33 @@ 
      *
      * @return bool|int
      */
-    public static function fileMustBeConverted( string $fullPath, bool $enforceOnXliff = false, ?string $filterAddress = null ) {
+    public static function fileMustBeConverted(string $fullPath, bool $enforceOnXliff = false, ?string $filterAddress = null) {
         $convert = true;
 
-        $fileType       = self::getInfo( $fullPath );
-        $memoryFileType = Files::getMemoryFileType( $fullPath );
+        $fileType       = self::getInfo($fullPath);
+        $memoryFileType = Files::getMemoryFileType($fullPath);
 
-        if ( Files::isXliff( $fullPath ) || $memoryFileType ) {
-            if ( !empty( $filterAddress ) ) {
+        if (Files::isXliff($fullPath) || $memoryFileType) {
+            if (!empty($filterAddress)) {
 
                 //conversion enforce
-                if ( !$enforceOnXliff ) {
+                if (!$enforceOnXliff) {
 
                     //if file is not proprietary AND Enforce is disabled
                     //we take it as is
-                    if ( !$fileType[ 'proprietary' ] || $memoryFileType ) {
+                    if (!$fileType['proprietary'] || $memoryFileType) {
                         $convert = false;
                         //ok don't convert a standard sdlxliff
                     }
                 } else {
                     //if conversion enforce is active
                     //we force all xliff files but not files produced by SDL Studio because we can handle them
-                    if ( in_array( $fileType[ 'proprietary_short_name' ], [ 'matecat_converter', 'trados', 'xliff_v2' ] ) || $memoryFileType ) {
+                    if (in_array($fileType['proprietary_short_name'], ['matecat_converter', 'trados', 'xliff_v2']) || $memoryFileType) {
                         $convert = false;
                         //ok don't convert a standard sdlxliff
                     }
                 }
-            } elseif ( $fileType[ 'proprietary' ] ) {
+            } elseif ($fileType['proprietary']) {
 
                 /**
                  * Application misconfiguration.

src/Utils/Files.php

Spacing +28 added lines, -28 removed lines

@@ -18,15 +18,15 @@ 
      *
      * @return array|mixed
      */
-    public static function pathInfo( string $path, ?int $options = 15 ) {
-        $rawPath = explode( DIRECTORY_SEPARATOR, $path );
+    public static function pathInfo(string $path, ?int $options = 15) {
+        $rawPath = explode(DIRECTORY_SEPARATOR, $path);
 
-        $basename = array_pop( $rawPath );
-        $dirname  = implode( DIRECTORY_SEPARATOR, $rawPath );
+        $basename = array_pop($rawPath);
+        $dirname  = implode(DIRECTORY_SEPARATOR, $rawPath);
 
-        $explodedFileName = explode( ".", $basename );
-        $extension        = strtolower( array_pop( $explodedFileName ) );
-        $filename         = implode( ".", $explodedFileName );
+        $explodedFileName = explode(".", $basename);
+        $extension        = strtolower(array_pop($explodedFileName));
+        $filename         = implode(".", $explodedFileName);
 
         $returnArray = [];
 
@@ -39,17 +39,17 @@ 
 
         // foreach flag, add in $return_array the corresponding field,
         // obtained by variable name correspondence
-        foreach ( $flagMap as $field => $i ) {
+        foreach ($flagMap as $field => $i) {
             //binary AND
-            if ( ( $options & $i ) > 0 ) {
+            if (($options & $i) > 0) {
                 //variable substitution: $field can be one between 'dirname', 'basename', 'extension', 'filename'
                 // $$field gets the value of the variable named $field
-                $returnArray[ $field ] = $$field;
+                $returnArray[$field] = $$field;
             }
         }
 
-        if ( count( $returnArray ) == 1 ) {
-            $returnArray = array_pop( $returnArray );
+        if (count($returnArray) == 1) {
+            $returnArray = array_pop($returnArray);
         }
 
         return $returnArray;
@@ -60,14 +60,14 @@ 
      *
      * @return ?string
      */
-    public static function getExtension( $path ): ?string {
-        $pathInfo = self::pathInfo( $path );
+    public static function getExtension($path): ?string {
+        $pathInfo = self::pathInfo($path);
 
-        if ( empty( $pathInfo ) ) {
+        if (empty($pathInfo)) {
             return null;
         }
 
-        return strtolower( $pathInfo[ 'extension' ] );
+        return strtolower($pathInfo['extension']);
     }
 
     /**
@@ -75,14 +75,14 @@ 
      *
      * @return bool
      */
-    public static function isXliff( ?string $path ): bool {
-        $extension = self::getExtension( $path );
+    public static function isXliff(?string $path): bool {
+        $extension = self::getExtension($path);
 
-        if ( !$extension ) {
+        if (!$extension) {
             return false;
         }
 
-        switch ( $extension ) {
+        switch ($extension) {
             case 'xliff':
             case 'sdlxliff':
             case 'tmx':
@@ -98,14 +98,14 @@ 
      *
      * @return bool|string
      */
-    public static function getMemoryFileType( string $path ) {
-        $pathInfo = self::pathInfo( $path );
+    public static function getMemoryFileType(string $path) {
+        $pathInfo = self::pathInfo($path);
 
-        if ( empty( $pathInfo ) ) {
+        if (empty($pathInfo)) {
             return false;
         }
 
-        switch ( strtolower( $pathInfo[ 'extension' ] ) ) {
+        switch (strtolower($pathInfo['extension'])) {
             case 'tmx':
                 return 'tmx';
             default:
@@ -118,8 +118,8 @@ 
      *
      * @return bool
      */
-    public static function isTMXFile( $path ): bool {
-        return self::getMemoryFileType( $path ) === 'tmx';
+    public static function isTMXFile($path): bool {
+        return self::getMemoryFileType($path) === 'tmx';
     }
 
     /**
@@ -127,8 +127,8 @@ 
      *
      * @return bool
      */
-    public static function isGlossaryFile( $path ): bool {
-        return self::getMemoryFileType( $path ) === 'glossary'; // return false
+    public static function isGlossaryFile($path): bool {
+        return self::getMemoryFileType($path) === 'glossary'; // return false
     }
 
 }

src/XliffReplacer/StatusToStateAttribute.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
             ?string $lastMrkState = null
     ): array {
 
-        $status = empty( $status ) ? TranslationStatus::STATUS_APPROVED2 : $status;
+        $status = empty($status) ? TranslationStatus::STATUS_APPROVED2 : $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
                 ],
         ];
@@ -68,14 +68,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/XliffSdl.php

Spacing +21 added lines, -21 removed lines

@@ -28,38 +28,38 @@ 
     /**
      * @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 ";
 
-            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\" ";
                     }
@@ -68,11 +68,11 @@ 
 
             $seg = $this->getCurrentSegment();
 
-            if ( 'sdl:seg' == $name && !empty( $seg ) && isset( $seg[ 'sid' ] ) ) {
-                $tag .= $this->prepareTargetStatuses( $seg );
+            if ('sdl:seg' == $name && !empty($seg) && isset($seg['sid'])) {
+                $tag .= $this->prepareTargetStatuses($seg);
             }
 
-            $this->checkForSelfClosedTagAndFlush( $parser, $tag );
+            $this->checkForSelfClosedTagAndFlush($parser, $tag);
 
         }
 
@@ -83,7 +83,7 @@ 
      *
      * @return string
      */
-    protected function prepareTargetStatuses( $segment ): string {
+    protected function prepareTargetStatuses($segment): string {
         $statusMap = [
                 'NEW'        => '',
                 'DRAFT'      => 'Draft',
@@ -93,19 +93,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;
@@ -120,7 +120,7 @@ 
      *
      * @return string
      */
-    protected function createTargetTag( string $translation, string $stateProp ): string {
+    protected function createTargetTag(string $translation, string $stateProp): string {
         $targetLang = ' xml:lang="' . $this->targetLang . '"';
 
         return "<target $targetLang $stateProp>$translation</target>";

src/XliffReplacer/AbstractXliffReplacer.php

Spacing +118 added lines, -118 removed lines

@@ -7,29 +7,29 @@ 
 
 abstract class AbstractXliffReplacer {
     protected $originalFP;
-    protected $outputFP;                  // output stream pointer
+    protected $outputFP; // output stream pointer
 
-    protected string $tuTagName;                 // <trans-unit> (forXliff v 1.*) or <unit> (forXliff v 2.*)
-    protected bool   $inTU                  = false;  // flag to check whether we are in a <trans-unit>
-    protected bool   $inTarget              = false;  // flag to check whether we are in a <target>, to ignore everything
-    protected bool   $inAltTrans            = false;  // flag to check whether we are in an <alt-trans> (xliff 1.2) or <mtc:matches> (xliff 2.0)
+    protected string $tuTagName; // <trans-unit> (forXliff v 1.*) or <unit> (forXliff v 2.*)
+    protected bool   $inTU                  = false; // flag to check whether we are in a <trans-unit>
+    protected bool   $inTarget              = false; // flag to check whether we are in a <target>, to ignore everything
+    protected bool   $inAltTrans            = false; // flag to check whether we are in an <alt-trans> (xliff 1.2) or <mtc:matches> (xliff 2.0)
     protected string $alternativeMatchesTag = ""; // polymorphic tag name for xliff 1.2 and 2.0
-    protected bool   $isEmpty               = false;  // flag to check whether we are in an empty tag (<tag/>)
-    protected bool   $targetWasWritten      = false;  // flag to check is <target> was written in the current unit
-    protected string $CDATABuffer           = "";       // buffer for special tag
-    protected string $namespace             = "";       // Custom namespace
-    protected bool   $bufferIsActive        = false;    // flag for buffeting
+    protected bool   $isEmpty               = false; // flag to check whether we are in an empty tag (<tag/>)
+    protected bool   $targetWasWritten      = false; // flag to check is <target> was written in the current unit
+    protected string $CDATABuffer           = ""; // buffer for special tag
+    protected string $namespace             = ""; // Custom namespace
+    protected bool   $bufferIsActive        = false; // flag for buffeting
 
-    protected int $offset = 0;         // offset for SAX pointer
+    protected int $offset = 0; // offset for SAX pointer
 
-    protected string  $currentBuffer;             // the current piece of text it's been parsed
-    protected int     $len;                       // length of the currentBuffer
-    protected array   $segments;                  // array of translations
+    protected string  $currentBuffer; // the current piece of text it's been parsed
+    protected int     $len; // length of the currentBuffer
+    protected array   $segments; // array of translations
     protected array   $lastTransUnit                  = [];
     protected int     $segmentInUnitPosition          = 0;
-    protected ?string $currentTransUnitId             = null;        // id of current <trans-unit>
+    protected ?string $currentTransUnitId             = null; // id of current <trans-unit>
     protected ?string $currentTransUnitIsTranslatable = null; // 'translate' attribute of current <trans-unit>
-    protected bool    $hasWrittenCounts               = false;  // check if <unit> already wrote segment counts (forXliff v 2.*)
+    protected bool    $hasWrittenCounts               = false; // check if <unit> already wrote segment counts (forXliff v 2.*)
     protected string  $targetLang;
     protected bool    $sourceInTarget                 = false;
 
@@ -79,8 +79,8 @@ 
             XliffReplacerCallbackInterface $callback = null
     ) {
         self::$INTERNAL_TAG_PLACEHOLDER = $this->getInternalTagPlaceholder();
-        $this->createOutputFileIfDoesNotExist( $outputFilePath );
-        $this->setFileDescriptors( $originalXliffPath, $outputFilePath );
+        $this->createOutputFileIfDoesNotExist($outputFilePath);
+        $this->setFileDescriptors($originalXliffPath, $outputFilePath);
         $this->xliffVersion   = $xliffVersion;
         $this->segments       = $segments;
         $this->targetLang     = $trgLang;
@@ -91,17 +91,17 @@ 
     }
 
     public function replaceTranslation() {
-        fwrite( $this->outputFP, '<?xml version="1.0" encoding="UTF-8"?>' );
+        fwrite($this->outputFP, '<?xml version="1.0" encoding="UTF-8"?>');
 
         //create Sax parser
         $xmlParser = $this->initSaxParser();
 
-        while ( $this->currentBuffer = fread( $this->originalFP, 4096 ) ) {
+        while ($this->currentBuffer = fread($this->originalFP, 4096)) {
             /*
                preprocess file
              */
             // obfuscate entities because sax automatically does html_entity_decode
-            $temporary_check_buffer = preg_replace( "/&(.*?);/", self::$INTERNAL_TAG_PLACEHOLDER . '$1' . self::$INTERNAL_TAG_PLACEHOLDER, $this->currentBuffer );
+            $temporary_check_buffer = preg_replace("/&(.*?);/", self::$INTERNAL_TAG_PLACEHOLDER . '$1' . self::$INTERNAL_TAG_PLACEHOLDER, $this->currentBuffer);
 
             //avoid cutting entities in half:
             //the last fread could have truncated an entity (say, '&lt;' in '&l'), thus invalidating the escaping
@@ -109,27 +109,27 @@ 
             // 9 is the max length of an entity. So, suppose that the & is at the end of buffer,
             // add 9 Bytes and substitute the entities, if the & is present, and it is not at the end
             //it can't be an entity, exit the loop
-            while ( true ) {
-                $_ampPos = strpos( $temporary_check_buffer, '&' );
+            while (true) {
+                $_ampPos = strpos($temporary_check_buffer, '&');
 
                 //check for real entity or escape it to safely exit from the loop!!!
-                if ( $_ampPos === false || strlen( substr( $temporary_check_buffer, $_ampPos ) ) > 9 ) {
+                if ($_ampPos === false || strlen(substr($temporary_check_buffer, $_ampPos)) > 9) {
                     break;
                 }
 
                 //if an entity is still present, fetch some more and repeat the escaping
-                $this->currentBuffer    .= fread( $this->originalFP, 9 );
-                $temporary_check_buffer = preg_replace( "/&(.*?);/", self::$INTERNAL_TAG_PLACEHOLDER . '$1' . self::$INTERNAL_TAG_PLACEHOLDER, $this->currentBuffer );
+                $this->currentBuffer .= fread($this->originalFP, 9);
+                $temporary_check_buffer = preg_replace("/&(.*?);/", self::$INTERNAL_TAG_PLACEHOLDER . '$1' . self::$INTERNAL_TAG_PLACEHOLDER, $this->currentBuffer);
             }
 
             //free stuff outside the loop
-            unset( $temporary_check_buffer );
+            unset($temporary_check_buffer);
 
-            $this->currentBuffer = preg_replace( "/&(.*?);/", self::$INTERNAL_TAG_PLACEHOLDER . '$1' . self::$INTERNAL_TAG_PLACEHOLDER, $this->currentBuffer );
-            $this->currentBuffer = str_replace( "&", self::$INTERNAL_TAG_PLACEHOLDER . 'amp' . self::$INTERNAL_TAG_PLACEHOLDER, $this->currentBuffer );
+            $this->currentBuffer = preg_replace("/&(.*?);/", self::$INTERNAL_TAG_PLACEHOLDER . '$1' . self::$INTERNAL_TAG_PLACEHOLDER, $this->currentBuffer);
+            $this->currentBuffer = str_replace("&", self::$INTERNAL_TAG_PLACEHOLDER . 'amp' . self::$INTERNAL_TAG_PLACEHOLDER, $this->currentBuffer);
 
             //get length of chunk
-            $this->len = strlen( $this->currentBuffer );
+            $this->len = strlen($this->currentBuffer);
 
             /*
             * Get the accumulated this->offset in the document:
@@ -139,12 +139,12 @@ 
             $this->offset += $this->len;
 
             //parse chunk of text
-            $this->runParser( $xmlParser );
+            $this->runParser($xmlParser);
 
         }
 
         // close Sax parser
-        $this->closeSaxParser( $xmlParser );
+        $this->closeSaxParser($xmlParser);
 
     }
 
@@ -153,15 +153,15 @@ 
      *
      * @return void
      */
-    protected function runParser( $xmlParser ) {
+    protected function runParser($xmlParser) {
         //parse chunk of text
-        if ( !xml_parse( $xmlParser, $this->currentBuffer, feof( $this->originalFP ) ) ) {
+        if (!xml_parse($xmlParser, $this->currentBuffer, feof($this->originalFP))) {
             //if unable, raise an exception
-            throw new RuntimeException( sprintf(
+            throw new RuntimeException(sprintf(
                     "XML error: %s at line %d",
-                    xml_error_string( xml_get_error_code( $xmlParser ) ),
-                    xml_get_current_line_number( $xmlParser )
-            ) );
+                    xml_error_string(xml_get_error_code($xmlParser)),
+                    xml_get_current_line_number($xmlParser)
+            ));
         }
     }
 
@@ -170,18 +170,18 @@ 
      *
      * @return string
      */
-    protected function getLastCharacter( $parser ): string {
+    protected function getLastCharacter($parser): string {
 
         //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 or 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
-        return $this->currentBuffer[ $idx - $this->offset ] ?? $this->currentBuffer[ $this->len - 1 ];
+        return $this->currentBuffer[$idx - $this->offset] ?? $this->currentBuffer[$this->len - 1];
 
     }
 
@@ -192,19 +192,19 @@ 
         return "§" .
                 substr(
                         str_replace(
-                                [ '+', '/' ],
+                                ['+', '/'],
                                 '',
-                                base64_encode( openssl_random_pseudo_bytes( 10, $_crypto_strong ) )
+                                base64_encode(openssl_random_pseudo_bytes(10, $_crypto_strong))
                         ),
                         0,
                         4
                 );
     }
 
-    private function createOutputFileIfDoesNotExist( string $outputFilePath ) {
+    private function createOutputFileIfDoesNotExist(string $outputFilePath) {
         // create output file
-        if ( !file_exists( $outputFilePath ) ) {
-            touch( $outputFilePath );
+        if (!file_exists($outputFilePath)) {
+            touch($outputFilePath);
         }
     }
 
@@ -212,13 +212,13 @@ 
      * @param string $originalXliffPath
      * @param string $outputFilePath
      */
-    private function setFileDescriptors( string $originalXliffPath, string $outputFilePath ) {
-        $this->outputFP = fopen( $outputFilePath, 'w+' );
+    private function setFileDescriptors(string $originalXliffPath, string $outputFilePath) {
+        $this->outputFP = fopen($outputFilePath, 'w+');
 
         $streamArgs = null;
 
-        if ( !( $this->originalFP = fopen( $originalXliffPath, "r", false, stream_context_create( $streamArgs ) ) ) ) {
-            throw new RuntimeException( "could not open XML input" );
+        if (!($this->originalFP = fopen($originalXliffPath, "r", false, stream_context_create($streamArgs)))) {
+            throw new RuntimeException("could not open XML input");
         }
     }
 
@@ -228,12 +228,12 @@ 
     public function __destruct() {
         //this stream can be closed outside the class
         //to permit multiple concurrent downloads, so suppress warnings
-        if ( is_resource( $this->originalFP ) ) {
-            fclose( $this->originalFP );
+        if (is_resource($this->originalFP)) {
+            fclose($this->originalFP);
         }
 
-        if ( is_resource( $this->outputFP ) ) {
-            fclose( $this->outputFP );
+        if (is_resource($this->outputFP)) {
+            fclose($this->outputFP);
         }
 
     }
@@ -244,11 +244,11 @@ 
      * @return resource
      */
     protected function initSaxParser() {
-        $xmlSaxParser = xml_parser_create( 'UTF-8' );
-        xml_set_object( $xmlSaxParser, $this );
-        xml_parser_set_option( $xmlSaxParser, XML_OPTION_CASE_FOLDING, false );
-        xml_set_element_handler( $xmlSaxParser, 'tagOpen', 'tagClose' );
-        xml_set_character_data_handler( $xmlSaxParser, 'characterData' );
+        $xmlSaxParser = xml_parser_create('UTF-8');
+        xml_set_object($xmlSaxParser, $this);
+        xml_parser_set_option($xmlSaxParser, XML_OPTION_CASE_FOLDING, false);
+        xml_set_element_handler($xmlSaxParser, 'tagOpen', 'tagClose');
+        xml_set_character_data_handler($xmlSaxParser, 'characterData');
 
         return $xmlSaxParser;
     }
@@ -256,8 +256,8 @@ 
     /**
      * @param resource $xmlSaxParser
      */
-    protected function closeSaxParser( $xmlSaxParser ) {
-        xml_parser_free( $xmlSaxParser );
+    protected function closeSaxParser($xmlSaxParser) {
+        xml_parser_free($xmlSaxParser);
     }
 
     /**
@@ -267,7 +267,7 @@ 
      *
      * @return mixed
      */
-    abstract protected function tagOpen( $parser, string $name, array $attr );
+    abstract protected function tagOpen($parser, string $name, array $attr);
 
     /**
      * @param resource $parser
@@ -275,7 +275,7 @@ 
      *
      * @return mixed
      */
-    abstract protected function tagClose( $parser, string $name );
+    abstract protected function tagClose($parser, string $name);
 
     /**
      * @param resource $parser
@@ -283,11 +283,11 @@ 
      *
      * @return mixed
      */
-    protected function characterData( $parser, string $data ): void {
+    protected function characterData($parser, string $data): void {
         // don't write <target> data
-        if ( !$this->inTarget && !$this->bufferIsActive ) {
-            $this->postProcAndFlush( $this->outputFP, $data );
-        } elseif ( $this->bufferIsActive ) {
+        if (!$this->inTarget && !$this->bufferIsActive) {
+            $this->postProcAndFlush($this->outputFP, $data);
+        } elseif ($this->bufferIsActive) {
             $this->CDATABuffer .= $data;
         }
     }
@@ -299,19 +299,19 @@ 
      * @param string   $data
      * @param bool     $treatAsCDATA
      */
-    protected function postProcAndFlush( $fp, string $data, bool $treatAsCDATA = false ) {
+    protected function postProcAndFlush($fp, string $data, bool $treatAsCDATA = false) {
         //postprocess string
-        $data = preg_replace( "/" . self::$INTERNAL_TAG_PLACEHOLDER . '(.*?)' . self::$INTERNAL_TAG_PLACEHOLDER . "/", '&$1;', $data );
-        $data = str_replace( '&nbsp;', ' ', $data );
-        if ( !$treatAsCDATA ) {
+        $data = preg_replace("/" . self::$INTERNAL_TAG_PLACEHOLDER . '(.*?)' . self::$INTERNAL_TAG_PLACEHOLDER . "/", '&$1;', $data);
+        $data = str_replace('&nbsp;', ' ', $data);
+        if (!$treatAsCDATA) {
             //unix2dos
-            $data = str_replace( "\r\n", "\r", $data );
-            $data = str_replace( "\n", "\r", $data );
-            $data = str_replace( "\r", "\r\n", $data );
+            $data = str_replace("\r\n", "\r", $data);
+            $data = str_replace("\n", "\r", $data);
+            $data = str_replace("\r", "\r\n", $data);
         }
 
         //flush to disk
-        fwrite( $fp, $data );
+        fwrite($fp, $data);
     }
 
     /**
@@ -320,19 +320,19 @@ 
      *
      * @return void
      */
-    protected function handleOpenUnit( string $name, array $attr ) {
+    protected function handleOpenUnit(string $name, array $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
             // current 'translate' attribute of the current trans-unit
-            $this->currentTransUnitIsTranslatable = empty( $attr[ 'translate' ] ) ? 'yes' : $attr[ 'translate' ];
+            $this->currentTransUnitIsTranslatable = empty($attr['translate']) ? 'yes' : $attr['translate'];
 
             $this->setLastTransUnitSegments();
 
@@ -346,15 +346,15 @@ 
      *
      * @return string
      */
-    protected function handleOpenXliffTag( string $name, array $attr, string $tag ): string {
+    protected function handleOpenXliffTag(string $name, array $attr, string $tag): string {
 
         // Add MateCat specific namespace.
         // Add trgLang
-        if ( $name === 'xliff' ) {
-            if ( !array_key_exists( 'xmlns:' . $this->namespace, $attr ) ) {
+        if ($name === 'xliff') {
+            if (!array_key_exists('xmlns:' . $this->namespace, $attr)) {
                 $tag .= ' xmlns:' . $this->namespace . '="https://www.matecat.com" ';
             }
-            $tag = preg_replace( '/trgLang="(.*?)"/', 'trgLang="' . $this->targetLang . '"', $tag );
+            $tag = preg_replace('/trgLang="(.*?)"/', 'trgLang="' . $this->targetLang . '"', $tag);
         }
 
         return $tag;
@@ -366,11 +366,11 @@ 
      *
      * @return void
      */
-    protected function checkSetInTarget( string $name ) {
+    protected function checkSetInTarget(string $name) {
 
         // check if we are entering into a <target>
-        if ( 'target' == $name && !$this->inAltTrans ) {
-            if ( $this->currentTransUnitIsTranslatable === 'no' ) {
+        if ('target' == $name && !$this->inAltTrans) {
+            if ($this->currentTransUnitIsTranslatable === 'no') {
                 $this->inTarget = false;
             } else {
                 $this->inTarget = true;
@@ -379,12 +379,12 @@ 
 
     }
 
-    protected function trySetAltTrans( string $name ) {
+    protected function trySetAltTrans(string $name) {
         $this->inAltTrans = $this->inAltTrans || $this->alternativeMatchesTag == $name;
     }
 
-    protected function tryUnsetAltTrans( string $name ) {
-        if ( $this->alternativeMatchesTag == $name ) {
+    protected function tryUnsetAltTrans(string $name) {
+        if ($this->alternativeMatchesTag == $name) {
             $this->inAltTrans = false;
         }
     }
@@ -394,15 +394,15 @@ 
      *
      * @return void
      */
-    protected function setInBuffer( string $name ) {
-        if ( in_array( $name, $this->nodesToBuffer ) ) {
+    protected function setInBuffer(string $name) {
+        if (in_array($name, $this->nodesToBuffer)) {
             $this->bufferIsActive = true;
         }
 
         // We need bufferIsActive for <target> nodes with currentTransUnitIsTranslatable = 'NO'
         // because in the other case, the target can be chunked into pieces by xml_set_character_data_handler()
         // and this can potentially lead to a wrong string rebuild by postProcAndFlush function if the internal placeholders are split
-        if($name === 'target' and $this->currentTransUnitIsTranslatable === 'no'){
+        if ($name === 'target' and $this->currentTransUnitIsTranslatable === 'no') {
             $this->bufferIsActive = true;
         }
     }
@@ -410,24 +410,24 @@ 
     /**
      * @param array $seg
      */
-    protected function updateSegmentCounts( array $seg = [] ) {
+    protected 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;
     }
 
     protected 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;
     }
 
     /**
@@ -436,16 +436,16 @@ 
      *
      * @return void
      */
-    protected function checkForSelfClosedTagAndFlush( $parser, string $tag ) {
+    protected function checkForSelfClosedTagAndFlush($parser, string $tag) {
 
-        $lastChar = $this->getLastCharacter( $parser );
+        $lastChar = $this->getLastCharacter($parser);
 
         //trim last space
-        $tag = rtrim( $tag );
+        $tag = rtrim($tag);
 
         //detect empty tag
         $this->isEmpty = $lastChar == '/';
-        if ( $this->isEmpty ) {
+        if ($this->isEmpty) {
             $tag .= $lastChar;
         }
 
@@ -453,11 +453,11 @@ 
         $tag .= ">";
 
         //set a Buffer for the segSource Source tag
-        if ( $this->bufferIsActive ) { // we are opening a critical CDATA section
+        if ($this->bufferIsActive) { // we are opening a critical CDATA section
             //these are NOT source/seg-source/value empty tags, THERE IS A CONTENT, write it in buffer
             $this->CDATABuffer .= $tag;
         } else {
-            $this->postProcAndFlush( $this->outputFP, $tag );
+            $this->postProcAndFlush($this->outputFP, $tag);
         }
 
     }
@@ -482,18 +482,18 @@ 
          */
         $this->lastTransUnit = [];
 
-        if ( !isset( $this->transUnits[ $this->currentTransUnitId ] ) ) {
+        if (!isset($this->transUnits[$this->currentTransUnitId])) {
             return;
         }
 
-        $listOfSegmentsIds = $this->transUnits[ $this->currentTransUnitId ];
+        $listOfSegmentsIds = $this->transUnits[$this->currentTransUnitId];
         $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];
             }
         }
     }
@@ -504,10 +504,10 @@ 
     protected function getCurrentSegment(): array {
         if (
             $this->currentTransUnitIsTranslatable !== 'no' &&
-            isset( $this->transUnits[ $this->currentTransUnitId ] ) &&
-            isset( $this->segments[ $this->segmentInUnitPosition ] )
+            isset($this->transUnits[$this->currentTransUnitId]) &&
+            isset($this->segments[$this->segmentInUnitPosition])
         ) {
-            return $this->segments[ $this->segmentInUnitPosition ];
+            return $this->segments[$this->segmentInUnitPosition];
         }
 
         return [];

src/XliffReplacer/Xliff20.php

Spacing +68 added lines, -68 removed lines

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