Test fix

Author: lbartoli79

tests/CPClientTest.php

@@ -301,6 +301,9 @@ public function testGetUser(): void
                 "status": "ACTIVE",
                 "vatNumber": null
               }
+              "wptIsPreviewEnabled": {
+                "enabled": false
+              }
             }
             }');
         $host = "http://webpagetest.org";

tests/RequestContextTest.php

@@ -36,6 +36,6 @@ public function testSetGetClient(): void
         $client = new CPClient($host);
         $request = new RequestContext($global_req);
         $request->setClient($client);
-        $this->assertEquals($host, $request->getClient()->host);
+        $this->assertEquals($host, $request->getClient()->getHost());
     }
 }

www/src/CPClient.php

@@ -102,6 +102,11 @@ public function isAuthenticated(): bool
         return !!$this->access_token;
     }
 
+    public function getHost(): ?string
+    {
+        return $this->host;
+    }
+
     public function login(string $code, string $code_verifier, string $redirect_uri): AuthToken
     {
         if (is_null($this->client_id) || is_null($this->client_secret)) {
@@ -316,19 +321,19 @@ public function getFullWptPlanSet(): PlanListSet
             return new Plan($options);
         }, $results->getData()['wptPlan'] ?? []);
 
-          $current_plans = array_filter($all_plans, function (Plan $plan) {
-              /** This is a bit of a hack for now. These are our approved plans for new
-               * customers to be able to use. We will better handle this from the backend
-               * */
-                return strtolower($plan->getId()) == 'ap5' ||
-                     strtolower($plan->getId()) == 'ap6' ||
-                     strtolower($plan->getId()) == 'ap7' ||
-                     strtolower($plan->getId()) == 'ap8' ||
-                     strtolower($plan->getId()) == 'mp5' ||
-                     strtolower($plan->getId()) == 'mp6' ||
-                     strtolower($plan->getId()) == 'mp7' ||
-                     strtolower($plan->getId()) == 'mp8';
-          });
+        $current_plans = array_filter($all_plans, function (Plan $plan) {
+            /** This is a bit of a hack for now. These are our approved plans for new
+             * customers to be able to use. We will better handle this from the backend
+             * */
+            return strtolower($plan->getId()) == 'ap5' ||
+                strtolower($plan->getId()) == 'ap6' ||
+                strtolower($plan->getId()) == 'ap7' ||
+                strtolower($plan->getId()) == 'ap8' ||
+                strtolower($plan->getId()) == 'mp5' ||
+                strtolower($plan->getId()) == 'mp6' ||
+                strtolower($plan->getId()) == 'mp7' ||
+                strtolower($plan->getId()) == 'mp8';
+        });
         $set = new PlanListSet();
         $set->setAllPlans(new PlanList(...$all_plans));
         $set->setCurrentPlans(new PlanList(...$current_plans));
@@ -1070,18 +1075,18 @@ public function updatePlan(string $subscription_id, string $next_plan_handle, bo
     public function updatePaymentMethod(string $token, ShippingAddress $address): bool
     {
         $gql = (new Mutation('wptUpdateSubscriptionPayment'))
-        ->setVariables([
-          new Variable('paymentToken', 'String', true),
-          new Variable('shippingAddress', 'ChargifyAddressInputType', true)
-        ])
-        ->setArguments([
-          'paymentToken' => '$paymentToken',
-          'shippingAddress' => '$shippingAddress'
-        ]);
+            ->setVariables([
+                new Variable('paymentToken', 'String', true),
+                new Variable('shippingAddress', 'ChargifyAddressInputType', true)
+            ])
+            ->setArguments([
+                'paymentToken' => '$paymentToken',
+                'shippingAddress' => '$shippingAddress'
+            ]);
 
         $variables = [
-          'paymentToken' => $token,
-          'shippingAddress' => $address->toArray()
+            'paymentToken' => $token,
+            'shippingAddress' => $address->toArray()
         ];
 
         $results = $this->graphql_client->runQuery($gql, true, $variables);

www/templates/layouts/includes/wpt-header.php

@@ -50,7 +50,7 @@ function addTab($tabName, $tabUrl, $addClass = '')
 $is_logged_in = Util::getSetting('cp_auth') && (!is_null($request_context)) && (!is_null($request_context->getClient()) && $request_context->getClient()->isAuthenticated());
 $user = !is_null($request_context) ? $request_context->getUser() : null;
 
-if ($request_context->isReadOnly()) {
+if (isset($request_context) && $request_context->isReadOnly()) {
 
 ?>
     <wpt-header style='margin-bottom: -1rem;'>