little bit of cleanup, adding few basic client unit tests

dcarbone · Jan 16, 2025 · de28e24 · de28e24
1 parent 983583e
commit de28e24
Show file tree

Hide file tree

Showing 37 changed files with 170 additions and 72 deletions.
diff --git a/files/constants.php b/files/constants.php
@@ -161,6 +161,8 @@
 const PHPFHIR_TEST_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG = PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG . 'Test';
 const PHPFHIR_TEST_ENCODING_CLASSNAME_SERIALIZE_CONFIG = PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG . 'Test';
 const PHPFHIR_TEST_ENCODING_CLASSSNAME_XML_WRITER = PHPFHIR_ENCODING_CLASSNAME_XML_WRITER . 'Test';
+const PHPFHIR_TEST_CLIENT_CLASSNAME_CONFIG = PHPFHIR_CLIENT_CLASSNAME_CONFIG . 'Test';
+const PHPFHIR_TEST_CLIENT_CLASSNAME_CLIENT = PHPFHIR_CLIENT_CLASSNAME_CLIENT . 'Test';
 
 // Test constant names
 const PHPFHIR_TEST_CONSTANT_INTEGRATION_ENDPOINT = 'PHPFHIR_TEST_INTEGRATION_ENDPOINT';

diff --git a/template/core/class_autoloader.php b/template/core/class_autoloader.php
@@ -28,8 +28,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 abstract class <?php echo PHPFHIR_CLASSNAME_AUTOLOADER; ?>
 

diff --git a/template/core/class_constants.php b/template/core/class_constants.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 final class <?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>
 

diff --git a/template/core/class_response_parser.php b/template/core/class_response_parser.php
@@ -29,8 +29,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 class <?php echo PHPFHIR_CLASSNAME_RESPONSE_PARSER; ?>
 

diff --git a/template/core/class_version_config.php b/template/core/class_version_config.php
@@ -37,8 +37,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 <?php echo ImportUtils::compileImportStatements($imports); ?>
 

diff --git a/template/core/client/class_client.php b/template/core/client/class_client.php
@@ -41,8 +41,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 <?php echo ImportUtils::compileImportStatements($imports); ?>
 
@@ -75,7 +74,7 @@ class <?php echo PHPFHIR_CLIENT_CLASSNAME_CLIENT; ?> implements <?php echo PHPFH
     public function __construct(string|<?php echo PHPFHIR_CLIENT_CLASSNAME_CONFIG; ?> $config)
     {
         if (is_string($config)) {
-            $config = new <?php echo PHPFHIR_CLIENT_CLASSNAME_CONFIG; ?>($config);
+            $config = new <?php echo PHPFHIR_CLIENT_CLASSNAME_CONFIG; ?>(address: $config);
         }
         $this->_config = $config;
     }
@@ -115,7 +114,7 @@ public function exec(<?php echo PHPFHIR_CLIENT_CLASSNAME_REQUEST; ?> $request):
             + [CURLOPT_CUSTOMREQUEST => $request->method]
             + array_merge($this->_config->getCurlOpts(), $request->options ?? []);
 
-        $parseResponseHeaders = ($this->_config->getParseHeaders() && (!isset($req->parseResponseHeaders) || $req->parseResponseHeaders))
+        $parseResponseHeaders = ($this->_config->getParseResponseHeaders() && (!isset($req->parseResponseHeaders) || $req->parseResponseHeaders))
             || (isset($req->parseResponseHeaders) && $req->parseResponseHeaders);
 
         if ($parseResponseHeaders) {

diff --git a/template/core/client/class_config.php b/template/core/client/class_config.php
@@ -28,8 +28,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 /**
  * Class <?php echo PHPFHIR_CLIENT_CLASSNAME_CONFIG; ?>
@@ -64,7 +63,6 @@ class <?php echo PHPFHIR_CLIENT_CLASSNAME_CONFIG; ?>
     public function __construct(string $address,
                                 null|<?php echo PHPFHIR_CLIENT_ENUM_RESPONSE_FORMAT; ?> $defaultFormat = null,
                                 array $queryParams = [],
-                                array $requestHeaders = [],
                                 array $curlOpts = [],
                                 bool $parseResponseHeaders = false)
     {
@@ -112,7 +110,7 @@ public function getCurlOpts(): array
     /**
      * @return bool
      */
-    public function getParseHeaders(): bool
+    public function getParseResponseHeaders(): bool
     {
         return $this->_parseResponseHeaders;
     }

diff --git a/template/core/client/class_request.php b/template/core/client/class_request.php
@@ -31,8 +31,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 class <?php echo PHPFHIR_CLIENT_CLASSNAME_REQUEST; ?>
 

diff --git a/template/core/client/class_response.php b/template/core/client/class_response.php
@@ -28,8 +28,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 class <?php echo PHPFHIR_CLIENT_CLASSNAME_RESPONSE; ?>
 

diff --git a/template/core/client/class_response_headers.php b/template/core/client/class_response_headers.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 class <?php echo PHPFHIR_CLIENT_CLASSNAME_RESPONSE_HEADERS; ?> implements \Countable
 {

diff --git a/template/core/client/enum_http_method.php b/template/core/client/enum_http_method.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 enum <?php echo PHPFHIR_CLIENT_ENUM_HTTP_METHOD; ?> : string
 {

diff --git a/template/core/client/enum_response_format.php b/template/core/client/enum_response_format.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 enum <?php echo PHPFHIR_CLIENT_ENUM_RESPONSE_FORMAT; ?> : string
 {

diff --git a/template/core/client/enum_sort_direction.php b/template/core/client/enum_sort_direction.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 enum <?php echo PHPFHIR_CLIENT_ENUM_SORT_DIRECTION; ?> : string
 {

diff --git a/template/core/client/exception_abstract_client.php b/template/core/client/exception_abstract_client.php
@@ -28,8 +28,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 abstract class <?php echo PHPFHIR_EXCEPTION_CLIENT_ABSTRACT_CLIENT; ?> extends \Exception
 {
     /** @var <?php echo $respClass->getFullyQualifiedName(true); ?> */

diff --git a/template/core/client/exception_client_error.php b/template/core/client/exception_client_error.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 class <?php echo PHPFHIR_EXCEPTION_CLIENT_ERROR; ?> extends <?php echo PHPFHIR_EXCEPTION_CLIENT_ABSTRACT_CLIENT; ?>
 

diff --git a/template/core/client/exception_unexpected_response_code.php b/template/core/client/exception_unexpected_response_code.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 class <?php echo PHPFHIR_EXCEPTION_CLIENT_UNEXPECTED_RESPONSE_CODE; ?> extends <?php echo PHPFHIR_EXCEPTION_CLIENT_ABSTRACT_CLIENT; ?>
 

diff --git a/template/core/client/interface_client.php b/template/core/client/interface_client.php
@@ -29,8 +29,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 interface <?php echo PHPFHIR_CLIENT_INTERFACE_CLIENT; ?>
 

diff --git a/template/core/encoding/class_serialize_config.php b/template/core/encoding/class_serialize_config.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 class <?php echo PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG; ?>
 

diff --git a/template/core/encoding/class_unserialize_config.php b/template/core/encoding/class_unserialize_config.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 class <?php echo PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG; ?>
 

diff --git a/template/core/encoding/class_xml_writer.php b/template/core/encoding/class_xml_writer.php
@@ -28,8 +28,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 /**
  * PHP FHIR XMLWriter Class.

diff --git a/template/core/encoding/enum_xml_location.php b/template/core/encoding/enum_xml_location.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 enum <?php echo PHPFHIR_ENCODING_ENUM_XML_LOCATION; ?> : string
 {

diff --git a/template/core/encoding/trait_xml_location.php b/template/core/encoding/trait_xml_location.php
@@ -30,8 +30,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 trait <?php echo PHPFHIR_ENCODING_TRAIT_XML_LOCATION; ?>
 

diff --git a/template/core/enum_version.php b/template/core/enum_version.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 <?php foreach($config->getVersionsIterator() as $version) : ?>
 use <?php echo $version->getFullyQualifiedName(false, PHPFHIR_VERSION_CLASSNAME_VERSION); ?> as <?php echo $version->getEnumImportName(); ?>;

diff --git a/template/core/interface_comment_container.php b/template/core/interface_comment_container.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 interface <?php echo PHPFHIR_INTERFACE_COMMENT_CONTAINER; ?>
 

diff --git a/template/core/interface_contained_type.php b/template/core/interface_contained_type.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 /**
  * Interface <?php echo PHPFHIR_INTERFACE_CONTAINED_TYPE; ?>

diff --git a/template/core/interface_primitive_type.php b/template/core/interface_primitive_type.php
@@ -24,8 +24,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 interface <?php echo PHPFHIR_INTERFACE_PRIMITIVE_TYPE; ?> extends <?php echo PHPFHIR_INTERFACE_TYPE; ?>
 

diff --git a/template/core/interface_type.php b/template/core/interface_type.php
@@ -41,8 +41,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 <?php echo ImportUtils::compileImportStatements($imports); ?>
 

diff --git a/template/core/interface_version.php b/template/core/interface_version.php
@@ -38,8 +38,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 <?php echo ImportUtils::compileImportStatements($imports); ?>
 

diff --git a/template/core/interface_version_config.php b/template/core/interface_version_config.php
@@ -37,8 +37,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 <?php echo ImportUtils::compileImportStatements($imports); ?>
 

diff --git a/template/core/interface_version_type_map.php b/template/core/interface_version_type_map.php
@@ -28,8 +28,7 @@
 
 namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
 
-<?php echo $config->getBasePHPFHIRCopyrightComment(false); ?>
-
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
 interface <?php echo PHPFHIR_INTERFACE_VERSION_TYPE_MAP; ?>
 

diff --git a/template/core/tests/client/test_class_client.php b/template/core/tests/client/test_class_client.php
@@ -0,0 +1,59 @@
+<?php declare(strict_types=1);
+
+/*
+ * Copyright 2025 Daniel Carbone ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+use DCarbone\PHPFHIR\Utilities\ImportUtils;
+
+/** @var \DCarbone\PHPFHIR\Config $config */
+/** @var \DCarbone\PHPFHIR\CoreFile $coreFile */
+
+$imports = $coreFile->getImports();
+$imports->addCoreFileImportsByName(
+    PHPFHIR_CLIENT_CLASSNAME_CONFIG,
+    PHPFHIR_CLIENT_CLASSNAME_CLIENT,
+);
+
+$coreFiles = $config->getCoreFiles();
+
+$clientClientClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_CLIENT_CLASSNAME_CLIENT);
+$clientConfigClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_CLIENT_CLASSNAME_CONFIG);
+
+ob_start();
+echo "<?php\n\n";?>
+namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
+
+<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
+
+<?php echo ImportUtils::compileImportStatements($imports); ?>
+use PHPUnit\Framework\TestCase;
+
+class <?php echo PHPFHIR_TEST_CLIENT_CLASSNAME_CLIENT; ?> extends TestCase
+{
+    public function testCanConstructWithOnlyAddress()
+    {
+        $cl = new <?php echo $clientClientClass->getEntityName(); ?>('http://example.com');
+        $this->assertEquals('http://example.com', $cl->getConfig()->getAddress());
+    }
+
+    public function testCanConstructWithConfig()
+    {
+        $c = new <?php echo $clientConfigClass->getEntityName(); ?>('http://example.com');
+        $cl = new <?php echo $clientClientClass->getEntityName(); ?>($c);
+        $this->assertEquals('http://example.com', $cl->getConfig()->getAddress());
+    }
+}
+<?php return ob_get_clean();