Merge pull request #169 from dcarbone/feature/small-fixes

small fixes

Author: dcarbone

template/core/client/interface_client.php

@@ -31,7 +31,7 @@
 
 <?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
 
-interface <?php echo PHPFHIR_CLIENT_INTERFACE_CLIENT; ?>
+interface <?php echo $coreFile; ?>
 
 {
     /**
@@ -41,6 +41,6 @@ interface <?php echo PHPFHIR_CLIENT_INTERFACE_CLIENT; ?>
      * @return <?php echo $respClass->getFullyQualifiedName(true); ?>
 
      */
-    public function exec(<?php echo PHPFHIR_CLIENT_CLASSNAME_REQUEST; ?> $request): <?php echo PHPFHIR_CLIENT_CLASSNAME_RESPONSE; ?>;
+    public function exec(<?php echo $reqClass; ?> $request): <?php echo $respClass; ?>;
 }
 <?php return ob_get_clean();

template/tests/core/mock/class_mock_version.php

@@ -75,7 +75,8 @@ public function getName(): string
         return self::NAME;
     }
 
-    public static function getFHIRVersion(): FHIRVersion
+    public static function getFHIRVersion(): <?php echo $fhirVersion; ?>
+
     {
         if (!isset(self::$_fhirVersion)) {
             self::$_fhirVersion = new <?php echo $fhirVersion; ?>(
@@ -108,12 +109,14 @@ public function getFHIRGenerationDate(): string
         throw new \BadMethodCallException('Not implemented');
     }
 
-    public function getConfig(): VersionConfigInterface
+    public function getConfig(): <?php echo $versionConfigInterface; ?>
+
     {
         return $this->_config;
     }
 
-    public function getTypeMap(): VersionTypeMapInterface
+    public function getTypeMap(): <?php echo $versionTypeMapInterface; ?>
+
     {
         if (!isset(self::$_typeMap)) {
             self::$_typeMap = new <?php echo $mockVersionTypeMap; ?>();

template/tests/core/mock/class_mock_version_config.php

@@ -59,12 +59,14 @@ public function __construct(null|<?php echo $unserializeConfig; ?> $unserializeC
         $this->_serializeConfig = $serializeConfig ?? new <?php echo $serializeConfig; ?>();
     }
 
-    public function getUnserializeConfig(): UnserializeConfig
+    public function getUnserializeConfig(): <?php echo $unserializeConfig; ?>
+
     {
         return $this->_unserializeConfig;
     }
 
-    public function getSerializeConfig(): SerializeConfig
+    public function getSerializeConfig(): <?php echo $serializeConfig; ?>
+
     {
         return $this->_serializeConfig;
     }