Fixing GA build error

deployment/php/conf/50_xdebug.ini

@@ -1,8 +1,8 @@
 [xdebug]
-xdebug.remote_enable = 1
+xdebug.mode=debug
 xdebug.remote_handler = dbgp
-xdebug.remote_host = host.docker.internal
-xdebug.remote_port = 9000
-xdebug.remote_autostart = 1
-xdebug.remote_connect_back = 1
-xdebug.idekey = VSCODE
+xdebug.client_host = host.docker.internal
+xdebug.client_port = 9000
+xdebug.start_with_request = yes
+xdebug.discover_client_host = true
+xdebug.idekey = VSCODE

deployment/tomcat/Dockerfile

@@ -1,6 +1,6 @@
-FROM tomcat:8.5.51-jdk8-openjdk-slim
+FROM tomcat:8.5.51-jdk8-adoptopenjdk-hotspot
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get --allow-releaseinfo-change update && apt-get install -y \
     python3 \
     python3-pip \
     && rm -rf /var/lib/apt/lists/*
@@ -15,4 +15,4 @@ RUN sed 's/\r$//g' /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh
 EXPOSE 8080 
 EXPOSE 8181
-ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]

relis_app/controllers/Paper.php

@@ -231,8 +231,7 @@ public function list_paper($paper_cat = 'all', $val = "_", $page = 0, $dynamic_t
          * Ajout de l'entête de la liste
          */
         if (!empty($data['list'])) {
-            $array_header = $field_list_header;
-            ;
+            $array_header = $field_list_header;;
             if (trim($data['list'][$key]['links']) != "") {
                 array_push($array_header, '');
             }
@@ -338,8 +337,7 @@ public function list_paper2($paper_cat = 'all', $val = "_", $page = 0)
                 } elseif ($v['input_select_source'] == 'table') {
                     $dropoboxes[$k] = $this->get_reference_select_values($v['input_select_values']);
                 }
-            }
-            ;
+            };
         }
         /*
          * Vérification des liens (links) a afficher sur la liste
@@ -579,8 +577,7 @@ public function view_paper($ref_id)
                 } elseif ($v['input_select_source'] == 'table') {
                     $dropoboxes[$k] = $this->get_reference_select_values($v['input_select_values']);
                 }
-            }
-            ;
+            };
         }
         $T_item_data_exclusion = array();
         $T_remove_exclusion_button = array();
@@ -623,8 +620,7 @@ public function view_paper($ref_id)
                 } elseif ($v['input_select_source'] == 'table') {
                     $dropoboxes[$k] = $this->get_reference_select_values($v['input_select_values']);
                 }
-            }
-            ;
+            };
         }
         $T_item_data_inclusion = array();
         $T_remove_inclusion_button = array();
@@ -667,8 +663,7 @@ public function view_paper($ref_id)
         } else {
             if (!empty($table_config['links']['add_child']['url']) and !empty($table_config['links']['add_child']['on_view']) and ($table_config['links']['add_child']['on_view'] == True)) {
                 //$data ['classification_button'] = '<li><a><button type="button" class="btn btn-success" data-toggle="modal" data-target="#relisformModal"  data-modal_link="manage/add_classification_modal/'.$ref_id.'"  data-operation_type="1" data-modal_title="Add classification  to : '.$paper_name.'" ><i class="fa fa-plus"></i> '.$table_config['links']['add_child']['label'] .' </button></a></li> ';
-                $data['classification_button'] = get_top_button('add', 'Add classification', 'manage/add_classification/' . $ref_id, 'Add classification') . " ";
-                ;
+                $data['classification_button'] = get_top_button('add', 'Add classification', 'manage/add_classification/' . $ref_id, 'Add classification') . " ";;
             }
         }
         /*
@@ -684,8 +679,7 @@ public function view_paper($ref_id)
                 } elseif ($v['input_select_source'] == 'table') {
                     $dropoboxes[$k] = $this->get_reference_select_values($v['input_select_values']);
                 }
-            }
-            ;
+            };
         }
         $T_item_data_assignation = array();
         $T_remove_assignation_button = array();
@@ -836,16 +830,15 @@ public function import_papers_save_bibtext()
         );
         $res2 = $this->manage_mdl->add_operation($operation_arr);
         //check if it is demo user
-        if($active_user != 2){
+        if ($active_user != 2) {
             if (!empty($imported)) {
                 set_top_msg(" $imported papers imported successfully");
             }
             if (!empty($exist)) {
                 set_top_msg(" $exist papers already exist", 'error');
             }
             redirect('screening/screening');
-        }
-        else{
+        } else {
             unset($_POST['data_array']);
             unset($_POST['papers_sources']);
             redirect('project/projects_list');
@@ -970,8 +963,7 @@ public function import_papers_load_bibtext()
                 $Tpapers = $this->get_bibler_result($bibtextString, "multi_bibtex");
             }
             //		vv
-            $data['json_values'] = $json_papers = json_encode($Tpapers['paper_array']);
-            ;
+            $data['json_values'] = $json_papers = json_encode($Tpapers['paper_array']);;
             // convert json into array
             /////$T_papers=json_decode($bibtextString);
             //z
@@ -1024,7 +1016,7 @@ public function import_papers_load_csv()
             //echo "File must be a .php";
             array_push($error_array, "File must be a csv file");
         } else {
-            
+
             $fp = fopen($_FILES['paper_file']['tmp_name'], 'rb');
             $i = 1;
             $last_count = 0;
@@ -1184,7 +1176,7 @@ public function save_bibtex_paper_saved()
             $end_time = microtime();
             //print_test($res);
             //	echo "<h1>".($end_time - $init_time)."</h1>";
-            
+
             if ($correct) {
                 //print_test($res);
                 $res = str_replace("True,", "'True',", $res);
@@ -1278,7 +1270,7 @@ private function paper_exist($paper_array)
                 $exist = True;
                 $verify_title = False;
             }
-        } 
+        }
         if ($verify_title) {
             foreach ($this->Paper_dataAccess->select_all_from_title($title) as $res) {
                 if (!empty($doi) && !empty($res['doi'])) {
@@ -1689,7 +1681,7 @@ private function get_bibler_result($bibtex, $operation = "single")
             //usleep(500);
         }
         $end_time = microtime();
-
+        ini_set('auto_detect_line_endings', TRUE);
         if ($correct) {
             $Tres = json_decode($res, True);
             if (json_last_error() === JSON_ERROR_NONE) {
@@ -1895,7 +1887,7 @@ public function test_bibler()
         $end_time = microtime();
         print_test($res);
         //	echo "<h1>".($end_time - $init_time)."</h1>";
-        
+
         if ($correct) {
             //$fp = fopen('test_'.time().'.txt', 'w+');
             //fputs($fp, $res);
@@ -1928,7 +1920,8 @@ private function ref_table_config($_table)
     }
 
     //import papers into the demo project
-    public function import_demo_project_paper(){
+    public function import_demo_project_paper()
+    {
 
         $bibFilePath = 'demo_relis.bib';
 
@@ -1940,6 +1933,5 @@ public function import_demo_project_paper(){
         $_POST['data_array'] = $paperData;
         $_POST['papers_sources'] = "";
         $this->import_papers_save_bibtext();
-
     }
-}
+}