Merge pull request #9 from MacPaw/develop

Release
MacPaw · May 12, 2023 · 9c6faeb · 9c6faeb
2 parents 6123ae3 + c469c1d
commit 9c6faeb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
     run:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:

diff --git a/src/Context/ApiContext.php b/src/Context/ApiContext.php
@@ -29,22 +29,22 @@ class ApiContext implements Context
     /**
      * @var array<string,string> $headers
      */
-    private array $headers = [];
+    protected array $headers = [];
 
     /**
      * @var array<string,string> $serverParams
      */
-    private array $serverParams = [];
+    protected array $serverParams = [];
 
     /**
      * @var array<mixed> $requestParams
      */
-    private array $requestParams = [];
+    protected array $requestParams = [];
 
     /**
      * @var array<mixed> $savedValues
      */
-    private array $savedValues = [];
+    protected array $savedValues = [];
 
     public function __construct(
         RouterInterface $router,
@@ -115,6 +115,7 @@ public function theRequestContainsParams(PyStringNode $params): void
 
         $newRequestParams = (array) json_decode($processedParams, true, 512, JSON_THROW_ON_ERROR);
         $this->requestParams = array_merge($this->requestParams, $newRequestParams);
+        $this->savedValues = array_merge($this->savedValues, $newRequestParams);
     }
 
     /**
@@ -277,7 +278,7 @@ public function responseShouldBeJsonWithVariableFields(string $variableFields, P
         $this->compareStructureResponse($variableFields, $string, $this->getResponse()->getContent());
     }
 
-    private function compareStructureResponse(string $variableFields, PyStringNode $string, string $actualJSON): void
+    protected function compareStructureResponse(string $variableFields, PyStringNode $string, string $actualJSON): void
     {
         if ($actualJSON === '') {
             throw new RuntimeException('Response is not JSON');
@@ -305,7 +306,7 @@ private function resetRequestOptions(): void
         $this->requestParams = [];
     }
 
-    private function getResponse(): Response
+    protected function getResponse(): Response
     {
         if ($this->response === null) {
             throw new RuntimeException('Response is null.');