imports optimized.

Author: syslogic

src/SearchKit/SearchKit.php

@@ -63,15 +63,16 @@ public function __construct( array|string $config ) {
 
     /** Unset properties irrelevant to the child class. */
     protected function post_init(): void {
-        $urls = [Constants::SEARCH_KIT_BASE_URL, Constants::SEARCH_KIT_BASE_URL_EU];
-        if (! in_array($this->base_url, $urls)) {
-            throw new InvalidArgumentException('SearchKit permits these base_url values: '. implode(', ', $urls));
-        }
         unset($this->oauth2_client_secret, $this->oauth2_api_scope, $this->oauth2_redirect_url);
         unset($this->token_expiry, $this->refresh_token, $this->id_token, $this->package_name, $this->product_id);
         unset($this->agc_client_id, $this->agc_client_secret);
         unset($this->developer_id, $this->project_id);
         unset($this->api_key, $this->api_signature);
+
+        $urls = [Constants::SEARCH_KIT_BASE_URL, Constants::SEARCH_KIT_BASE_URL_EU];
+        if (! in_array($this->base_url, $urls)) {
+            throw new InvalidArgumentException('SearchKit permits these base_url values: '. implode(', ', $urls));
+        }
     }
 
     /** Provide HTTP request headers as array. */
@@ -81,7 +82,7 @@ protected function auth_header(): array {
             "Content-Type" => "application/json; charset=utf-8",
             "Authorization" => "Bearer $this->access_token",
             "X-Kit-AppID" => $this->oauth2_client_id,
-            "X-Kit-ClientIP" => $this->client_ip,
+            // "X-Kit-ClientIP" => $this->client_ip,
             "X-Kit-RequestID" => $this->request_id
         ];
     }

tests/BaseTestCase.php

@@ -16,11 +16,11 @@ abstract class BaseTestCase extends TestCase {
     protected static int $oauth2_client_id = 0;            // OAuth2 client.
     protected static ?string $oauth2_client_secret = null; // OAuth2 client.
     protected static ?string $oauth2_token_path = '../.credentials/huawei_token.json';
+    protected static ?string $user_access_token = null;
     protected static string $build_path;
 
     protected static string $file_id = 'BhrdFPv6j8QzM60pdSadNXY_FZRnRp_AM';
 
-    protected static ?string $user_access_token = null;
     protected static int $agc_client_id = 0;               // AGConnect API.
     protected static ?string $agc_client_secret = null;    // AGConnect API.
 
@@ -29,10 +29,7 @@ abstract class BaseTestCase extends TestCase {
     protected static ?string $package_name = null;
     protected static int $project_id = 0;
     protected static int $product_id = 0;
-    protected static int $cp_id = 0;
 
-    /** AppGallery Connect Gateway URL */
-    protected static ?string $agc_gateway             = 'https://connect-drcn.dbankcloud.cn/';
     private const ENV_VAR_OAUTH2_CLIENT_ID            = 'Variable HUAWEI_OAUTH2_CLIENT_ID is not set.';
     private const ENV_VAR_OAUTH2_CLIENT_SECRET        = 'Variable HUAWEI_OAUTH2_CLIENT_SECRET is not set.';
     private const ENV_VAR_APP_LEVEL_CLIENT_ID         = 'Variable HUAWEI_APP_LEVEL_CLIENT_ID is not set.'; // TODO

tests/SearchKitTest.php

@@ -21,9 +21,13 @@ class SearchKitTest extends BaseTestCase {
     /** This method is called before the first test of this test class is run. */
     public static function setUpBeforeClass(): void {
         parent::setUpBeforeClass();
-        self::$oauth2_client_id = getenv('HUAWEI_APP_LEVEL_CLIENT_ID');
-        self::$oauth2_client_secret = getenv('HUAWEI_APP_LEVEL_CLIENT_SECRET');
-        self::$client = new SearchKit( array_merge(self::get_user_config(), [
+        if ( is_string( getenv('HUAWEI_APP_LEVEL_CLIENT_ID' ) ) ) {
+            self::$oauth2_client_id = getenv('HUAWEI_APP_LEVEL_CLIENT_ID');
+        }
+        if ( is_string( getenv('HUAWEI_APP_LEVEL_CLIENT_SECRET' ) ) ) {
+            self::$oauth2_client_secret = getenv('HUAWEI_APP_LEVEL_CLIENT_SECRET');
+        }
+        self::$client = new SearchKit( array_merge( self::get_user_config(), [
             'oauth2_client_id' => self::$oauth2_client_id,
             'oauth2_client_secret' => self::$oauth2_client_secret,
             'debug_mode' => false

tests/WalletKitTest.php

@@ -1,8 +1,8 @@
 <?php /** @noinspection PhpPropertyOnlyWrittenInspection */
 namespace Tests;
 
-use HMS\WalletKit\WalletObject\WalletObject;
 use HMS\WalletKit\WalletKit;
+use HMS\WalletKit\WalletObject\WalletObject;
 
 /**
  * HMS WalletKit Test: Skipped.