Merge remote-tracking branch 'origin/develop'

matecat · Feb 29, 2024 · a36c1cb · a36c1cb
2 parents bd5be9c + c33524a
commit a36c1cb
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 2,086 deletions.
diff --git a/lib/Controller/API/V2/AbstractDownloadController.php b/lib/Controller/API/V2/AbstractDownloadController.php
@@ -216,8 +216,9 @@ protected function nocache() {
 
     /**
      * Download the file
+     * @param bool $forceXliff
      */
-    public function finalize() {
+    public function finalize($forceXliff = false) {
         try {
             $this->unlockToken();
 
@@ -231,9 +232,7 @@ public function finalize() {
 
             $isGDriveProject = \Projects_ProjectDao::isGDriveProject( $this->project->id );
 
-            $forceXliff = intval( filter_input( INPUT_GET, 'forceXliff' ) );
-
-            if ( !$isGDriveProject || $forceXliff === 1 ) {
+            if ( !$isGDriveProject || $forceXliff === true ) {
                 $buffer = ob_get_contents();
                 ob_get_clean();
                 ob_start( "ob_gzhandler" );  // compress page before sending

diff --git a/lib/Controller/API/V2/DownloadFileController.php b/lib/Controller/API/V2/DownloadFileController.php
@@ -148,7 +148,7 @@ private function downloadFile($forceXliff = false) {
 
         $this->featureSet = new FeatureSet();
         $this->processDownload();
-        $this->finalize();
+        $this->finalize($forceXliff);
     }
 
     /**

diff --git a/lib/Utils/LQA/QA.php b/lib/Utils/LQA/QA.php
@@ -1669,19 +1669,6 @@ public function performTagPositionCheck($source, $target, $performIdCheck = true
         $selfClosingTags_src = $selfClosingTags_src[ 1 ];
         $selfClosingTags_trg = $selfClosingTags_trg[ 1 ];
 
-        //
-        // ===========================================
-        // Check the count mismatch
-        // ===========================================
-        //
-        if(
-            count($open_malformedXmlSrcStruct) !== count($open_malformedXmlTrgStruct) or
-            count($closing_malformedXmlSrcStruct) !== count($closing_malformedXmlTrgStruct) or
-            count($selfClosingTags_src) !== count($selfClosingTags_trg)
-        ){
-            $this->addError( self::ERR_COUNT );
-        }
-
         //
         // ===========================================
         // Compare the tag id(s) and equiv-text content

diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "@babel/plugin-transform-runtime": "^7.23.7",
     "@babel/preset-env": "^7.23.8",
     "@babel/preset-react": "^7.23.3",
-    "@sentry/webpack-plugin": "2.13.0",
+    "@sentry/webpack-plugin": "2.14.0",
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.5.2",