issue #272 - Fix default value and getter for nullable property

Author: mikaelcom

src/File/Struct.php

@@ -13,6 +13,8 @@
 use WsdlToPhp\PackageGenerator\Model\AbstractModel;
 use WsdlToPhp\PackageGenerator\Model\Struct as StructModel;
 use WsdlToPhp\PackageGenerator\Model\StructAttribute as StructAttributeModel;
+use WsdlToPhp\PhpGenerator\Element\AccessRestrictedElementInterface;
+use WsdlToPhp\PhpGenerator\Element\AssignedValueElementInterface;
 use WsdlToPhp\PhpGenerator\Element\PhpAnnotation;
 use WsdlToPhp\PhpGenerator\Element\PhpAnnotationBlock;
 use WsdlToPhp\PhpGenerator\Element\PhpConstant;
@@ -77,8 +79,8 @@ protected function fillClassProperties(PropertyContainer $properties): void
             $properties->add(
                 new PhpProperty(
                     $attribute->getCleanName(),
-                    $attribute->isRequired() ? PhpProperty::NO_VALUE : null,
-                    $this->getGenerator()->getOptionValidation() ? PhpProperty::ACCESS_PROTECTED : PhpProperty::ACCESS_PUBLIC,
+                    $attribute->isRequired() ? AssignedValueElementInterface::NO_VALUE : null,
+                    $this->getGenerator()->getOptionValidation() ? AccessRestrictedElementInterface::ACCESS_PROTECTED : AccessRestrictedElementInterface::ACCESS_PUBLIC,
                     $type
                 )
             );
@@ -167,9 +169,11 @@ protected function getStructMethodParameter(StructAttributeModel $attribute): Ph
         }
 
         try {
+            $defaultValue = $attribute->getDefaultValue();
+
             return new PhpFunctionParameter(
                 lcfirst($attribute->getUniqueString($attribute->getCleanName(), 'method')),
-                $attribute->isRequired() ? PhpFunctionParameter::NO_VALUE : $attribute->getDefaultValue(),
+                $attribute->isRequired() && !$attribute->isAChoice() ? AssignedValueElementInterface::NO_VALUE : (str_contains($type ?? '', '?') ? $defaultValue ?? null : $defaultValue),
                 $type,
                 $attribute
             );
@@ -197,7 +201,7 @@ protected function addStructMethodAddTo(StructAttributeModel $attribute): self
             $method = new PhpMethod(sprintf('addTo%s', ucfirst($attribute->getCleanName())), [
                 new PhpFunctionParameter(
                     'item',
-                    PhpFunctionParameter::NO_VALUE,
+                    AssignedValueElementInterface::NO_VALUE,
                     $this->getStructAttributeTypeAsPhpType($attribute, false),
                     $attribute
                 ),
@@ -325,7 +329,7 @@ protected function addStructMethodGetBodyReturn(PhpMethod $method, StructAttribu
                 $return = sprintf('return $asDomDocument ? $domDocument : $this->%1$s;', $thisAccess);
             }
         } elseif ($attribute->getRemovableFromRequest() || $attribute->isAChoice()) {
-            $return = sprintf('return isset($this->%1$s) ? $this->%1$s : null;', $thisAccess);
+            $return = sprintf('return $this->%s ?? null;', $thisAccess);
         }
         $method->addChild($return);
 
@@ -342,7 +346,7 @@ protected function addStructMethodGet(StructAttributeModel $attribute): self
                 break;
 
             default:
-                $returnType = (!$attribute->getRemovableFromRequest() && $attribute->isRequired() ? '' : '?').$this->getStructAttributeTypeAsPhpType($attribute);
+                $returnType = (!$attribute->getRemovableFromRequest() && !$attribute->isAChoice() && $attribute->isRequired() ? '' : '?').$this->getStructAttributeTypeAsPhpType($attribute);
 
                 break;
         }
@@ -524,7 +528,7 @@ protected function addStructMethodsSetAndGetAnnotationBlockFromStructAttribute(s
                 }
                 $this
                     ->addStructMethodsGetAnnotationBlockFromXmlAttribute($annotationBlock, $attribute)
-                    ->addStructMethodsGetAnnotationBlock($annotationBlock, $this->getStructAttributeTypeGetAnnotation($attribute))
+                    ->addStructMethodsGetAnnotationBlock($annotationBlock, $this->getStructAttributeTypeGetAnnotation($attribute, true, $attribute->isAChoice()))
                 ;
 
                 break;

src/Model/StructAttribute.php

@@ -136,7 +136,7 @@ public function isList(): bool
     }
 
     /**
-     * @return array|bool|float|int|string
+     * @return array|bool|float|int|string|null
      */
     public function getDefaultValue()
     {

tests/resources/generated/ValidApiOffer.php

@@ -56,7 +56,7 @@ public function __construct(?string $offerClassMember = null, ?\StructType\ApiOf
      */
     public function getOfferClassMember(): ?string
     {
-        return isset($this->offerClassMember) ? $this->offerClassMember : null;
+        return $this->offerClassMember ?? null;
     }
     /**
      * Set offerClassMember value
@@ -88,7 +88,7 @@ public function setOfferClassMember(?string $offerClassMember = null): self
      */
     public function getOffer(): ?\StructType\ApiOffer
     {
-        return isset($this->offer) ? $this->offer : null;
+        return $this->offer ?? null;
     }
     /**
      * Set offer value

tests/resources/generated/ValidCampaignGetItem.php

@@ -419,7 +419,7 @@ public function setStatusClarification(?string $statusClarification = null): sel
      */
     public function getSourceId(): ?int
     {
-        return isset($this->SourceId) ? $this->SourceId : null;
+        return $this->SourceId ?? null;
     }
     /**
      * Set SourceId value
@@ -523,7 +523,7 @@ public function setRepresentedBy(?\StructType\ApiCampaignAssistant $representedB
      */
     public function getDailyBudget(): ?\StructType\ApiDailyBudget
     {
-        return isset($this->DailyBudget) ? $this->DailyBudget : null;
+        return $this->DailyBudget ?? null;
     }
     /**
      * Set DailyBudget value
@@ -551,7 +551,7 @@ public function setDailyBudget(?\StructType\ApiDailyBudget $dailyBudget = null):
      */
     public function getEndDate(): ?string
     {
-        return isset($this->EndDate) ? $this->EndDate : null;
+        return $this->EndDate ?? null;
     }
     /**
      * Set EndDate value
@@ -579,7 +579,7 @@ public function setEndDate(?string $endDate = null): self
      */
     public function getNegativeKeywords(): ?\ArrayType\ApiArrayOfString
     {
-        return isset($this->NegativeKeywords) ? $this->NegativeKeywords : null;
+        return $this->NegativeKeywords ?? null;
     }
     /**
      * Set NegativeKeywords value
@@ -607,7 +607,7 @@ public function setNegativeKeywords(?\ArrayType\ApiArrayOfString $negativeKeywor
      */
     public function getBlockedIps(): ?\ArrayType\ApiArrayOfString
     {
-        return isset($this->BlockedIps) ? $this->BlockedIps : null;
+        return $this->BlockedIps ?? null;
     }
     /**
      * Set BlockedIps value
@@ -635,7 +635,7 @@ public function setBlockedIps(?\ArrayType\ApiArrayOfString $blockedIps = null):
      */
     public function getExcludedSites(): ?\ArrayType\ApiArrayOfString
     {
-        return isset($this->ExcludedSites) ? $this->ExcludedSites : null;
+        return $this->ExcludedSites ?? null;
     }
     /**
      * Set ExcludedSites value

tests/resources/generated/ValidDetails.php

@@ -296,11 +296,11 @@ public function __construct(?array $mutualSettlementDetailCalcCostShipping = nul
     }
     /**
      * Get mutualSettlementDetailCalcCostShipping value
-     * @return \StructType\ApiMutualSettlementDetailCalcCostShipping[]
+     * @return \StructType\ApiMutualSettlementDetailCalcCostShipping[]|null
      */
     public function getMutualSettlementDetailCalcCostShipping(): ?array
     {
-        return isset($this->mutualSettlementDetailCalcCostShipping) ? $this->mutualSettlementDetailCalcCostShipping : null;
+        return $this->mutualSettlementDetailCalcCostShipping ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailCalcCostShipping method
@@ -464,11 +464,11 @@ public function addToMutualSettlementDetailCalcCostShipping(\StructType\ApiMutua
     }
     /**
      * Get mutualSettlementDetailCashFlow value
-     * @return \StructType\ApiMutualSettlementDetailCashFlow[]
+     * @return \StructType\ApiMutualSettlementDetailCashFlow[]|null
      */
     public function getMutualSettlementDetailCashFlow(): ?array
     {
-        return isset($this->mutualSettlementDetailCashFlow) ? $this->mutualSettlementDetailCashFlow : null;
+        return $this->mutualSettlementDetailCashFlow ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailCashFlow method
@@ -632,11 +632,11 @@ public function addToMutualSettlementDetailCashFlow(\StructType\ApiMutualSettlem
     }
     /**
      * Get mutualSettlementDetailClientPayment value
-     * @return \StructType\ApiMutualSettlementDetailClientPayment[]
+     * @return \StructType\ApiMutualSettlementDetailClientPayment[]|null
      */
     public function getMutualSettlementDetailClientPayment(): ?array
     {
-        return isset($this->mutualSettlementDetailClientPayment) ? $this->mutualSettlementDetailClientPayment : null;
+        return $this->mutualSettlementDetailClientPayment ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailClientPayment method
@@ -800,11 +800,11 @@ public function addToMutualSettlementDetailClientPayment(\StructType\ApiMutualSe
     }
     /**
      * Get mutualSettlementDetailPostReturnRegistry value
-     * @return \StructType\ApiMutualSettlementDetailPostReturnRegistry[]
+     * @return \StructType\ApiMutualSettlementDetailPostReturnRegistry[]|null
      */
     public function getMutualSettlementDetailPostReturnRegistry(): ?array
     {
-        return isset($this->mutualSettlementDetailPostReturnRegistry) ? $this->mutualSettlementDetailPostReturnRegistry : null;
+        return $this->mutualSettlementDetailPostReturnRegistry ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailPostReturnRegistry method
@@ -968,11 +968,11 @@ public function addToMutualSettlementDetailPostReturnRegistry(\StructType\ApiMut
     }
     /**
      * Get mutualSettlementDetailRouteList value
-     * @return \StructType\ApiMutualSettlementDetailRouteList[]
+     * @return \StructType\ApiMutualSettlementDetailRouteList[]|null
      */
     public function getMutualSettlementDetailRouteList(): ?array
     {
-        return isset($this->mutualSettlementDetailRouteList) ? $this->mutualSettlementDetailRouteList : null;
+        return $this->mutualSettlementDetailRouteList ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailRouteList method
@@ -1136,11 +1136,11 @@ public function addToMutualSettlementDetailRouteList(\StructType\ApiMutualSettle
     }
     /**
      * Get mutualSettlementDetailTrackNumberPayment value
-     * @return \StructType\ApiMutualSettlementDetailTrackNumberPayment[]
+     * @return \StructType\ApiMutualSettlementDetailTrackNumberPayment[]|null
      */
     public function getMutualSettlementDetailTrackNumberPayment(): ?array
     {
-        return isset($this->mutualSettlementDetailTrackNumberPayment) ? $this->mutualSettlementDetailTrackNumberPayment : null;
+        return $this->mutualSettlementDetailTrackNumberPayment ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailTrackNumberPayment method
@@ -1304,11 +1304,11 @@ public function addToMutualSettlementDetailTrackNumberPayment(\StructType\ApiMut
     }
     /**
      * Get mutualSettlementDetailServiceRegistration value
-     * @return \StructType\ApiMutualSettlementDetailServiceRegistration[]
+     * @return \StructType\ApiMutualSettlementDetailServiceRegistration[]|null
      */
     public function getMutualSettlementDetailServiceRegistration(): ?array
     {
-        return isset($this->mutualSettlementDetailServiceRegistration) ? $this->mutualSettlementDetailServiceRegistration : null;
+        return $this->mutualSettlementDetailServiceRegistration ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailServiceRegistration method
@@ -1472,11 +1472,11 @@ public function addToMutualSettlementDetailServiceRegistration(\StructType\ApiMu
     }
     /**
      * Get mutualSettlementDetailAcceptanceRegistry value
-     * @return \StructType\ApiMutualSettlementDetailAcceptanceRegistry[]
+     * @return \StructType\ApiMutualSettlementDetailAcceptanceRegistry[]|null
      */
     public function getMutualSettlementDetailAcceptanceRegistry(): ?array
     {
-        return isset($this->mutualSettlementDetailAcceptanceRegistry) ? $this->mutualSettlementDetailAcceptanceRegistry : null;
+        return $this->mutualSettlementDetailAcceptanceRegistry ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailAcceptanceRegistry method
@@ -1640,11 +1640,11 @@ public function addToMutualSettlementDetailAcceptanceRegistry(\StructType\ApiMut
     }
     /**
      * Get mutualSettlementDetailAdditionalChargeFare value
-     * @return \StructType\ApiMutualSettlementDetailAdditionalChargeFare[]
+     * @return \StructType\ApiMutualSettlementDetailAdditionalChargeFare[]|null
      */
     public function getMutualSettlementDetailAdditionalChargeFare(): ?array
     {
-        return isset($this->mutualSettlementDetailAdditionalChargeFare) ? $this->mutualSettlementDetailAdditionalChargeFare : null;
+        return $this->mutualSettlementDetailAdditionalChargeFare ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailAdditionalChargeFare method
@@ -1808,11 +1808,11 @@ public function addToMutualSettlementDetailAdditionalChargeFare(\StructType\ApiM
     }
     /**
      * Get mutualSettlementDetailOutgoingRequestToCarrier value
-     * @return \StructType\ApiMutualSettlementDetailOutgoingRequestToCarrier[]
+     * @return \StructType\ApiMutualSettlementDetailOutgoingRequestToCarrier[]|null
      */
     public function getMutualSettlementDetailOutgoingRequestToCarrier(): ?array
     {
-        return isset($this->mutualSettlementDetailOutgoingRequestToCarrier) ? $this->mutualSettlementDetailOutgoingRequestToCarrier : null;
+        return $this->mutualSettlementDetailOutgoingRequestToCarrier ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailOutgoingRequestToCarrier method
@@ -1976,11 +1976,11 @@ public function addToMutualSettlementDetailOutgoingRequestToCarrier(\StructType\
     }
     /**
      * Get mutualSettlementDetailSMSInformation value
-     * @return \StructType\ApiMutualSettlementDetailSMSInformation[]
+     * @return \StructType\ApiMutualSettlementDetailSMSInformation[]|null
      */
     public function getMutualSettlementDetailSMSInformation(): ?array
     {
-        return isset($this->mutualSettlementDetailSMSInformation) ? $this->mutualSettlementDetailSMSInformation : null;
+        return $this->mutualSettlementDetailSMSInformation ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailSMSInformation method
@@ -2144,11 +2144,11 @@ public function addToMutualSettlementDetailSMSInformation(\StructType\ApiMutualS
     }
     /**
      * Get mutualSettlementDetailBuyerGoodsReturn value
-     * @return \StructType\ApiMutualSettlementDetailBuyerGoodsReturn[]
+     * @return \StructType\ApiMutualSettlementDetailBuyerGoodsReturn[]|null
      */
     public function getMutualSettlementDetailBuyerGoodsReturn(): ?array
     {
-        return isset($this->mutualSettlementDetailBuyerGoodsReturn) ? $this->mutualSettlementDetailBuyerGoodsReturn : null;
+        return $this->mutualSettlementDetailBuyerGoodsReturn ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailBuyerGoodsReturn method
@@ -2312,11 +2312,11 @@ public function addToMutualSettlementDetailBuyerGoodsReturn(\StructType\ApiMutua
     }
     /**
      * Get mutualSettlementDetailProductsPackaging value
-     * @return \StructType\ApiMutualSettlementDetailProductsPackaging[]
+     * @return \StructType\ApiMutualSettlementDetailProductsPackaging[]|null
      */
     public function getMutualSettlementDetailProductsPackaging(): ?array
     {
-        return isset($this->mutualSettlementDetailProductsPackaging) ? $this->mutualSettlementDetailProductsPackaging : null;
+        return $this->mutualSettlementDetailProductsPackaging ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailProductsPackaging method
@@ -2480,11 +2480,11 @@ public function addToMutualSettlementDetailProductsPackaging(\StructType\ApiMutu
     }
     /**
      * Get mutualSettlementDetailAdjustmentWriteRegisters value
-     * @return \StructType\ApiMutualSettlementDetailAdjustmentWriteRegisters[]
+     * @return \StructType\ApiMutualSettlementDetailAdjustmentWriteRegisters[]|null
      */
     public function getMutualSettlementDetailAdjustmentWriteRegisters(): ?array
     {
-        return isset($this->mutualSettlementDetailAdjustmentWriteRegisters) ? $this->mutualSettlementDetailAdjustmentWriteRegisters : null;
+        return $this->mutualSettlementDetailAdjustmentWriteRegisters ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailAdjustmentWriteRegisters method
@@ -2648,11 +2648,11 @@ public function addToMutualSettlementDetailAdjustmentWriteRegisters(\StructType\
     }
     /**
      * Get mutualSettlementDetailSafeCustody value
-     * @return \StructType\ApiMutualSettlementDetailSafeCustody[]
+     * @return \StructType\ApiMutualSettlementDetailSafeCustody[]|null
      */
     public function getMutualSettlementDetailSafeCustody(): ?array
     {
-        return isset($this->mutualSettlementDetailSafeCustody) ? $this->mutualSettlementDetailSafeCustody : null;
+        return $this->mutualSettlementDetailSafeCustody ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailSafeCustody method
@@ -2816,11 +2816,11 @@ public function addToMutualSettlementDetailSafeCustody(\StructType\ApiMutualSett
     }
     /**
      * Get mutualSettlementDetailSafeCustodyCalculation value
-     * @return \StructType\ApiMutualSettlementDetailSafeCustodyCalculation[]
+     * @return \StructType\ApiMutualSettlementDetailSafeCustodyCalculation[]|null
      */
     public function getMutualSettlementDetailSafeCustodyCalculation(): ?array
     {
-        return isset($this->mutualSettlementDetailSafeCustodyCalculation) ? $this->mutualSettlementDetailSafeCustodyCalculation : null;
+        return $this->mutualSettlementDetailSafeCustodyCalculation ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailSafeCustodyCalculation method
@@ -2984,11 +2984,11 @@ public function addToMutualSettlementDetailSafeCustodyCalculation(\StructType\Ap
     }
     /**
      * Get mutualSettlementDetailRegisterStorage value
-     * @return \StructType\ApiMutualSettlementDetailRegisterStorage[]
+     * @return \StructType\ApiMutualSettlementDetailRegisterStorage[]|null
      */
     public function getMutualSettlementDetailRegisterStorage(): ?array
     {
-        return isset($this->mutualSettlementDetailRegisterStorage) ? $this->mutualSettlementDetailRegisterStorage : null;
+        return $this->mutualSettlementDetailRegisterStorage ?? null;
     }
     /**
      * This method is responsible for validating the values passed to the setMutualSettlementDetailRegisterStorage method