resolve issues running tests using env vars, check for non null object member values

Author: WildBamaBoy

test/CheckoutTest.php

@@ -16,17 +16,22 @@
 
 class CheckoutTest extends TestCase
 {
-    public int $projectId = 1361049;
-    public string $privateKey = (string)getenv("TEBEX_CHECKOUT_PRIVATE_KEY");
-    private string $testPaymentId = (string)getenv("TEBEX_CHECKOUT_TEST_PAYMENT_ID");
-    private string $testRecurringPaymentId =  (string)getenv("TEBEX_CHECKOUT_TEST_RECURRING_PAYMENT_ID");
+    public int $projectId;
+    public string $privateKey;
+    private string $testPaymentId;
+    private string $testRecurringPaymentId;
 
     private BasketBuilder $testBasketBuilder;
 
     protected function setUp() : void
     {
         parent::setUp();
-        Checkout::setApiKeys("1361049", "pzpwOOO7Y7oUzQUVLeeH8smzfKYHy6gd");
+        $this->projectId = (int)getenv("TEBEX_CHECKOUT_PROJECT_ID");
+        $this->privateKey = (string)getenv("TEBEX_CHECKOUT_PRIVATE_KEY");
+        $this->testPaymentId = (string)getenv("TEBEX_CHECKOUT_TEST_PAYMENT_ID");
+        $this->testRecurringPaymentId =  (string)getenv("TEBEX_CHECKOUT_TEST_RECURRING_PAYMENT_ID");
+
+        Checkout::setApiKeys($this->projectId,$this->privateKey);
     }
 
     private function createTestBasketBuilder() {

test/HeadlessTest.php

@@ -14,15 +14,19 @@
 
 class HeadlessTest extends TestCase
 {
-    public string $publicToken = (string)getenv("TEBEX_HEADLESS_PUBLIC_TOKEN");
-    public string $rustPublicToken = (string)getenv("TEBEX_HEADLESS_TEST_RUST_PUBLIC_TOKEN");
-    public string $universalPublicToken = (string)getenv("TEBEX_HEADLESS_TEST_UNIVERSAL_PUBLIC_TOKEN");
+    public string $publicToken;
+    public string $rustPublicToken;
+    public string $universalPublicToken;
 
     public TebexProject $project;
 
     public BasketFacade $basket;
 
     protected function setUp() : void {
+        $this->publicToken = (string) getenv("TEBEX_HEADLESS_PUBLIC_TOKEN");
+        $this->rustPublicToken = (string) getenv("TEBEX_HEADLESS_TEST_RUST_PUBLIC_TOKEN");
+        $this->universalPublicToken = (string) getenv("TEBEX_HEADLESS_TEST_UNIVERSAL_PUBLIC_TOKEN");
+
         $this->project = Headless::setProject($this->publicToken);
     }
 
@@ -39,6 +43,7 @@ public function testCreateBasket()
     {
         $basket = $this->_createBasketFacade();
         self::assertInstanceOf(Basket::class, $basket->getBasket());
+        self::assertNotNull($basket->getBasket()->getId());
     }
 
     public function testGetUserAuthUrl()
@@ -65,11 +70,13 @@ public function testGetCheckoutLinks()
         self::assertNotEmpty($links);
         self::assertNotNull($links);
         self::assertArrayHasKey("checkout", $links);
+        self::assertNotNull($links["checkout"]);
     }
 
     public function testGetAllCategories()
     {
         self::assertNotEmpty(Headless::getAllCategories());
+        self::assertNotNull(Headless::getAllCategories()[0]->getId());
     }
 
     public function testGetHeadlessApi()
@@ -88,11 +95,13 @@ public function testGetBasketByIdent()
     public function testGetWebstore()
     {
         self::assertNotEmpty(Headless::getWebstore());
+        self::assertNotNull(Headless::getWebstore()->getId());
     }
 
     public function testGetAllPackages()
     {
         self::assertNotEmpty(Headless::getAllPackages());
+        self::assertNotNull(Headless::getAllPackages()[0]->getId());
     }
 
     public function testGetCategory()
@@ -102,6 +111,7 @@ public function testGetCategory()
         $category = Headless::getCategory($categoryId);
         self::assertNotNull($category);
         self::assertInstanceOf(Category::class, $category);
+        self::assertNotNull($category->getId());
     }
 
     public function testGetPackage()
@@ -111,6 +121,7 @@ public function testGetPackage()
         $package = Headless::getPackage($packageId);
         self::assertNotNull($packages);
         self::assertInstanceOf(Package::class, $package);
+        self::assertNotNull($package->getId());
     }
 
     public function testAddCoupon()