Merge remote-tracking branch 'origin/login-required' into sentry-conf…

…ig-update
matecat · riccio82 · Oct 17, 2024 · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024
commit 8c002ffb6b56cc0946df3a7187c4beb61f22cf54
diff --git a/INSTALL/matecat.sql b/INSTALL/matecat.sql
@@ -199,7 +199,7 @@ CREATE TABLE `comments`
     `uid`          bigint(20)  DEFAULT NULL,
     `resolve_date` datetime    DEFAULT NULL,
     `source_page`  tinyint(4)  DEFAULT NULL,
-    `is_owner`     tinyint(4)   NOT NULL,
+    `is_anonymous` tinyint(4)  NOT NULL DEFAULT 0,
     `message_type` tinyint(4)  DEFAULT NULL,
     `message`      text,
     PRIMARY KEY (`id`),

diff --git a/composer.json b/composer.json
@@ -37,6 +37,7 @@
         "ext-mbstring": "*",
         "ext-zlib": "*",
         "ext-gd": "*",
+        "ext-iconv": "*",
         "orhanerday/open-ai": "^4.7",
         "ext-openssl": "*",
         "league/oauth2-linkedin": "^5.1",

diff --git a/docker b/docker
diff --git a/inc/Bootstrap.php b/inc/Bootstrap.php
@@ -163,7 +163,7 @@ private function notifyBootCompleted() {
         $this->autoLoadedFeatureSet->run( 'bootstrapCompleted' );
     }
 
-    public static function exceptionHandler( $exception ) {
+    public static function exceptionHandler( Throwable $exception ) {
 
         Log::$fileName = 'fatal_errors.txt';
 
@@ -190,7 +190,7 @@ public static function exceptionHandler( $exception ) {
             $message          = "Conflict";
             $response_message = $exception->getMessage();
             Log::doJsonLog( [ "error" => 'The request could not be completed due to a conflict with the current state of the resource. - ' . "{$exception->getMessage()} ", "trace" => $exception->getTrace() ] );
-        } catch ( \PDOException $e ) {
+        } catch ( PDOException $e ) {
             $code    = 503;
             $message = "Service Unavailable";
 //            \Utils::sendErrMailReport( $exception->getMessage() . "" . $exception->getTraceAsString(), 'Generic error' );
@@ -199,7 +199,7 @@ public static function exceptionHandler( $exception ) {
             $code    = 500;
             $message = "Internal Server Error";
 //            \Utils::sendErrMailReport( $exception->getMessage() . "" . $exception->getTraceAsString(), 'Generic error' );
-            Log::doJsonLog( [ "error" => $exception->getMessage(), "trace" => $exception->getTrace() ] );
+            Log::doJsonLog( [ "ExceptionType" => get_class( $e ), "error" => $exception->getMessage(), "trace" => $exception->getTrace() ] );
         }
 
         if ( stripos( PHP_SAPI, 'cli' ) === false ) {

diff --git a/inc/validation/schema/filters_extraction_parameters.json b/inc/validation/schema/filters_extraction_parameters.json
@@ -95,11 +95,6 @@
     "yaml": {
       "type": "object",
       "properties": {
-        "extract_arrays": {
-          "type": "boolean",
-          "nullable": true,
-          "default": false
-        },
         "translate_keys": {
           "type": "array",
           "nullable": true

diff --git a/inc/validation/schema/project_template.json b/inc/validation/schema/project_template.json
@@ -11,15 +11,6 @@
     "id_team": {
       "type": ["integer", "string"]
     },
-    "speech2text": {
-      "type": "boolean"
-    },
-    "lexica": {
-      "type": "boolean"
-    },
-    "tag_projection": {
-      "type": "boolean"
-    },
     "pretranslate_100": {
       "type": "boolean"
     },
@@ -29,9 +20,17 @@
     "get_public_matches": {
       "type": "boolean"
     },
-    "cross_language_matches": {
-      "type": ["null", "object"],
-      "$ref": "#/definitions/cross_language_matches"
+    "team_id": {
+      "type":  ["null", "integer", "string"]
+    },
+    "subject": {
+      "type":  ["null", "string"]
+    },
+    "source_language": {
+      "type":  ["null", "string"]
+    },
+    "target_language": {
+      "type":  ["null", "array"]
     },
     "segmentation_rule": {
       "type": ["null", "object"]
@@ -63,24 +62,10 @@
   "required": [
     "name",
     "id_team",
-    "speech2text",
-    "lexica",
-    "tag_projection",
     "pretranslate_100",
     "get_public_matches"
   ],
   "definitions": {
-    "cross_language_matches": {
-      "type": ["null", "object"],
-      "properties": {
-        "primary": {
-          "type": ["null", "string"]
-        },
-        "secondary": {
-          "type": ["null", "string"]
-        }
-      }
-    },
     "tm": {
       "type": "object",
       "properties": {

diff --git a/lib/Controller/API/App/FilesController.php b/lib/Controller/API/App/FilesController.php
@@ -5,17 +5,17 @@
 use API\Commons\AbstractStatefulKleinController;
 use API\Commons\Validators\ChunkPasswordValidator;
 use API\Commons\Validators\LoginValidator;
-use Chunks_ChunkStruct;
+use Jobs_JobStruct;
 use Files\FilesPartsDao;
 
 class FilesController extends AbstractStatefulKleinController {
 
     /**
-     * @var Chunks_ChunkStruct
+     * @var Jobs_JobStruct
      */
     protected $chunk ;
 
-    public function setChunk( Chunks_ChunkStruct $chunk ){
+    public function setChunk( Jobs_JobStruct $chunk ){
         $this->chunk = $chunk;
     }
 

diff --git a/lib/Controller/API/App/StatsController.php b/lib/Controller/API/App/StatsController.php
@@ -6,7 +6,7 @@
 use API\Commons\Validators\ChunkPasswordValidator;
 use API\Commons\Validators\LoginValidator;
 use CatUtils;
-use Chunks_ChunkStruct;
+use Jobs_JobStruct;
 use WordCount\WordCountStruct;
 
 /**
@@ -19,11 +19,11 @@
 class StatsController extends KleinController {
 
     /**
-     * @var Chunks_ChunkStruct
+     * @var Jobs_JobStruct
      */
     protected $chunk;
 
-    public function setChunk( Chunks_ChunkStruct $chunk ) {
+    public function setChunk( Jobs_JobStruct $chunk ) {
         $this->chunk = $chunk;
     }
 

diff --git a/lib/Controller/API/Commons/KleinController.php b/lib/Controller/API/Commons/KleinController.php
@@ -55,17 +55,17 @@ abstract class KleinController implements IController {
     /**
      * @var array
      */
-    public $params;
+    public array $params = [];
 
     /**
-     * @var FeatureSet
+     * @var ?FeatureSet
      */
-    protected $featureSet;
+    protected ?FeatureSet $featureSet = null;
 
     /**
      * @return FeatureSet
      */
-    public function getFeatureSet() {
+    public function getFeatureSet(): FeatureSet {
         return $this->featureSet;
     }
 
@@ -74,7 +74,7 @@ public function getFeatureSet() {
      *
      * @return $this
      */
-    public function setFeatureSet( FeatureSet $featureSet ) {
+    public function setFeatureSet( FeatureSet $featureSet ): KleinController {
         $this->featureSet = $featureSet;
 
         return $this;
@@ -121,7 +121,7 @@ public function __construct( $request, $response, $service, $app ) {
      * @throws ReflectionException
      * @throws Exception
      */
-    public function refreshClientSessionIfNotApi(){
+    public function refreshClientSessionIfNotApi() {
         if ( empty( $this->api_key ) ) {
             Bootstrap::sessionStart();
             AuthenticationHelper::refreshSession( $_SESSION );

diff --git a/lib/Controller/API/Commons/Validators/ChunkPasswordValidator.php b/lib/Controller/API/Commons/Validators/ChunkPasswordValidator.php
@@ -14,15 +14,16 @@
 namespace API\Commons\Validators;
 
 use API\Commons\KleinController;
-use Chunks_ChunkStruct;
+use Jobs_JobStruct;
 use Exceptions\NotFoundException;
 use Jobs_JobDao;
 use LQA\ChunkReviewDao;
 use LQA\ChunkReviewStruct;
+use ReflectionException;
 
 class ChunkPasswordValidator extends Base {
     /**
-     * @var \Chunks_ChunkStruct
+     * @var \Jobs_JobStruct
      */
     protected $chunk;
 
@@ -95,12 +96,12 @@ protected function getChunkFromRevisePassword() {
     }
 
     /**
-     * @throws NotFoundException
+     * @throws ReflectionException
      */
     protected function getChunkFromTranslatePassword() {
-        $this->chunk = Jobs_JobDao::getByIdAndPassword( $this->request->id_job, $this->request->password, 0, new Chunks_ChunkStruct );
+        $this->chunk = Jobs_JobDao::getByIdAndPassword( $this->request->id_job, $this->request->password, 0, new Jobs_JobStruct );
         if ( !empty( $this->chunk ) ) {
-            $this->chunkReview = @( new ChunkReviewDao() )->findChunkReviews( $this->chunk )[ 0 ];
+            $this->chunkReview = ( new ChunkReviewDao() )->findChunkReviews( $this->chunk )[ 0 ] ?? null;
         }
     }
 

diff --git a/lib/Controller/API/Commons/Validators/JobPasswordValidator.php b/lib/Controller/API/Commons/Validators/JobPasswordValidator.php
@@ -13,9 +13,9 @@
 
 class JobPasswordValidator extends Base {
     /**
-     * @var \Jobs_JobStruct
+     * @var Jobs_JobStruct
      */
-    private $jStruct;
+    private Jobs_JobStruct $jStruct;
 
     /**
      * @var KleinController

diff --git a/lib/Controller/API/NewController.php b/lib/Controller/API/NewController.php
@@ -1,7 +1,10 @@
 <?php
 
+use API\Commons\Exceptions\AuthenticationError;
 use Constants\ConversionHandlerStatus;
 use Conversion\ConvertedFileModel;
+use Exceptions\NotFoundException;
+use Exceptions\ValidationError;
 use FilesStorage\AbstractFilesStorage;
 use FilesStorage\FilesStorageFactory;
 use Filters\FiltersConfigTemplateDao;
@@ -14,6 +17,8 @@
 use ProjectQueue\Queue;
 use QAModelTemplate\QAModelTemplateDao;
 use QAModelTemplate\QAModelTemplateStruct;
+use TaskRunner\Exceptions\EndQueueException;
+use TaskRunner\Exceptions\ReQueueException;
 use Teams\MembershipDao;
 use TMS\TMSService;
 use Validator\EngineValidator;
@@ -128,6 +133,11 @@ class NewController extends ajaxController {
 
     private $xliff_parameters;
 
+    private $dictation;
+    private $show_whitespace;
+    private $character_counter;
+    private $ai_assistant;
+
     private function setBadRequestHeader() {
         $this->httpHeader = 'HTTP/1.0 400 Bad Request';
     }
@@ -203,6 +213,10 @@ public function __construct() {
                 'tag_projection'             => [ 'filter' => FILTER_VALIDATE_BOOLEAN ],
                 'project_completion'         => [ 'filter' => FILTER_VALIDATE_BOOLEAN ],
                 'get_public_matches'         => [ 'filter' => FILTER_VALIDATE_BOOLEAN ], // disable public TM matches
+                'dictation'                  => [ 'filter' => FILTER_VALIDATE_BOOLEAN ],
+                'show_whitespace'            => [ 'filter' => FILTER_VALIDATE_BOOLEAN ],
+                'character_counter'          => [ 'filter' => FILTER_VALIDATE_BOOLEAN ],
+                'ai_assistant'               => [ 'filter' => FILTER_VALIDATE_BOOLEAN ],
                 'instructions'               => [
                         'filter' => FILTER_SANITIZE_STRING,
                         'flags'  => FILTER_REQUIRE_ARRAY,
@@ -370,6 +384,15 @@ public function finalize() {
         echo $toJson;
     }
 
+    /**
+     * @throws ReQueueException
+     * @throws AuthenticationError
+     * @throws ValidationError
+     * @throws NotFoundException
+     * @throws EndQueueException
+     * @throws ReflectionException
+     * @throws Exception
+     */
     public function doAction() {
 
         $fs = FilesStorageFactory::create();
@@ -578,9 +601,7 @@ public function doAction() {
         if ( isset( $this->result[ 'data' ] ) && !empty( $this->result[ 'data' ] ) ) {
             foreach ( $this->result[ 'data' ] as $zipFileName => $zipFiles ) {
                 $zipFiles = json_decode( $zipFiles, true );
-
-
-                $fileNames = Utils::array_column( $zipFiles, 'name' );
+                $fileNames = array_column( $zipFiles, 'name' );
                 $arFiles   = array_merge( $arFiles, $fileNames );
             }
         }
@@ -650,6 +671,11 @@ public function doAction() {
         $projectStructure[ 'pretranslate_100' ] = (int)!!$this->postInput[ 'pretranslate_100' ]; // Force pretranslate_100 to be 0 or 1
         $projectStructure[ 'pretranslate_101' ] = isset( $this->postInput[ 'pretranslate_101' ] ) ? (int)$this->postInput[ 'pretranslate_101' ] : 1;
 
+        $projectStructure['dictation']          = $this->postInput['dictation'] ?? null;
+        $projectStructure['show_whitespace']    = $this->postInput['show_whitespace'] ?? null;
+        $projectStructure['character_counter']  = $this->postInput['character_counter'] ?? null;
+        $projectStructure['ai_assistant']       = $this->postInput['ai_assistant'] ?? null;
+
         //default get all public matches from TM
         $projectStructure[ 'only_private' ] = ( !isset( $this->postInput[ 'get_public_matches' ] ) ? false : !$this->postInput[ 'get_public_matches' ] );
 
@@ -746,11 +772,11 @@ public function doAction() {
      * @param $filename
      *
      * @return array
-     * @throws \API\Commons\Exceptions\AuthenticationError
-     * @throws \Exceptions\NotFoundException
-     * @throws \Exceptions\ValidationError
-     * @throws \TaskRunner\Exceptions\EndQueueException
-     * @throws \TaskRunner\Exceptions\ReQueueException
+     * @throws AuthenticationError
+     * @throws NotFoundException
+     * @throws ValidationError
+     * @throws EndQueueException
+     * @throws ReQueueException
      */
     private function getFileMetadata( $filename ) {
         $info          = XliffProprietaryDetect::getInfo( $filename );

diff --git a/lib/Controller/API/V1/StatsController.php b/lib/Controller/API/V1/StatsController.php
@@ -7,17 +7,17 @@
 use API\Commons\Validators\ChunkPasswordValidator;
 use CatUtils;
 use API\V2\Validators\LoginValidator;
-use Chunks_ChunkStruct;
+use Jobs_JobStruct;
 use WordCount\WordCountStruct;
 
 class StatsController extends KleinController {
 
     /**
-     * @var Chunks_ChunkStruct
+     * @var Jobs_JobStruct
      */
     protected $chunk ;
 
-    public function setChunk( Chunks_ChunkStruct $chunk ){
+    public function setChunk( Jobs_JobStruct $chunk ){
         $this->chunk = $chunk;
     }