Merge pull request #187 from Mdwiki-TD/update_new

Refactor cats api

Author: MrIbrahem

.gitignore

@@ -48,7 +48,6 @@ leaderboard/z.php
 composer.lock
 /tests_backup
 .phpunit.result.cache
-phpunit.xml.dist
 phpunit.xml.z
 run.sh
 /src/.claude

phpunit.xml

@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true">
-
-    <testsuites>
-        <testsuite name="ParseWiki Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
+<phpunit bootstrap="tests/bootstrap.php"
+         colors="true"
+         stopOnFailure="false"
+         verbose="true">
+  <testsuites>
+    <testsuite name="Project Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">.</directory>
+    </include>
+    <exclude>
+      <directory>vendor</directory>
+      <directory>tests</directory>
+    </exclude>
+  </coverage>
+</phpunit>

run_tests.sh

@@ -0,0 +1,3 @@
+
+vendor/bin/phpunit tests --testdox --colors=always -c phpunit.xml
+

src/backend/api_calls/curl_api.php

@@ -28,7 +28,7 @@ function isvalid($str)
     return !empty($str) && strtolower($str) != "all";
 }
 
-function super_function($api_params, $sql_params, $sql_query, $no_refind = false, $table_name = null)
+function super_function(array $api_params, array $sql_params, string $sql_query, $table_name = null, $no_refind = false): array
 {
     global $use_td_api;
     // ---

src/backend/api_calls/mdwiki_api.php

@@ -39,7 +39,7 @@ function exists_by_qids_query_and_category($lang, $category)
     // ---
     $params = [$lang, $category];
     // ---
-    $u_data = super_function($api_params, $params, $query, $no_refind = false, $table_name = "all_qids_titles");
+    $u_data = super_function($api_params, $params, $query, "all_qids_titles");
     // ---
     $data2[$lang . $category] = $u_data;
     // ---
@@ -71,7 +71,7 @@ function exists_by_qids_query($lang)
     // ---
     $params = [$lang];
     // ---
-    $u_data = super_function($api_params, $params, $query, $no_refind = false, $table_name = "all_qids_titles");
+    $u_data = super_function($api_params, $params, $query, "all_qids_titles");
     // ---
     $data2[$lang] = $u_data;
     // ---

src/backend/api_or_sql/index.php

@@ -32,7 +32,7 @@ function get_process_all_new(): array
     return $process_all;
 }
 
-function get_user_process_new($user, $year_y = "all")
+function get_user_process_new(string $user, string $year_y = "all")
 {
     // ---
     static $cache = [];
@@ -53,7 +53,7 @@ function get_user_process_new($user, $year_y = "all")
         $api_params['year'] = $year_y;
     }
     // ---
-    $data = super_function($api_params, $params, $query, true);
+    $data = super_function($api_params, $params, $query, "in_process", true);
     // ---
     $cache[$user] = $data;
     // ---
@@ -82,7 +82,7 @@ function get_users_process_new(): array
     return $process_new;
 }
 
-function get_lang_in_process_new($code, $year_y = "all")
+function get_lang_in_process_new($code, $year_y = "all"): array
 {
     // ---
     static $cache = [];
@@ -113,7 +113,7 @@ function get_lang_in_process_new($code, $year_y = "all")
         $api_params['year'] = $year_y;
     }
     // ---
-    $data = super_function($api_params, $params, $query, true);
+    $data = super_function($api_params, $params, $query, "in_process", true);
     // ---
     // $cache[$code] = array_column($data, 'title');
     $cache[$code] = $data;

src/backend/api_or_sql/new_sql_tables.php

@@ -23,10 +23,15 @@
 function getinprocess($missing, $code)
 {
     $res = get_lang_in_process_new($code);
+    // ---
     $titles = [];
+    // ---
     foreach ($res as $t) {
-        if (in_array($t['title'], $missing)) $titles[$t['title']] = $t;
+        if (in_array($t['title'], $missing)) {
+            $titles[$t['title']] = $t;
+        }
     }
+    // ---
     return $titles;
 }