Skip to content

Commit

Permalink
fix extraneous space in DGDS_v3.wsdl and regenerate code
Browse files Browse the repository at this point in the history
  • Loading branch information
JeremyDunn committed Nov 3, 2017
1 parent 5a945d7 commit 77381bd
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
42 changes: 21 additions & 21 deletions src/FedEx/DGDSService/Request.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
namespace FedEx\DGDSService;

use FedEx\AbstractRequest;

/**
Expand All @@ -16,7 +16,7 @@ class Request extends AbstractRequest
const TESTING_URL = 'https://wsbeta.fedex.com:443/web-services/dgds';

protected static $wsdlFileName = 'DGDS_v3.wsdl';

/**
* Sends the AddDangerousGoodsHandlingUnitRequest and returns the response
*
Expand All @@ -30,12 +30,12 @@ public function getAddDangerousGoodsHandlingUnitReply(ComplexType\AddDangerousGo
if ($returnStdClass) {
return $response;
}

$addDangerousGoodsHandlingUnitReply = new ComplexType\AddDangerousGoodsHandlingUnitReply;
$addDangerousGoodsHandlingUnitReply->populateFromStdClass($response);
return $addDangerousGoodsHandlingUnitReply;
}

/**
* Sends the ModifyDangerousGoodsShipmentRequest and returns the response
*
Expand All @@ -49,12 +49,12 @@ public function getModifyDangerousGoodsShipmentReply(ComplexType\ModifyDangerous
if ($returnStdClass) {
return $response;
}

$modifyDangerousGoodsShipmentReply = new ComplexType\ModifyDangerousGoodsShipmentReply;
$modifyDangerousGoodsShipmentReply->populateFromStdClass($response);
return $modifyDangerousGoodsShipmentReply;
}

/**
* Sends the UploadDangerousGoodsRequest and returns the response
*
Expand All @@ -68,12 +68,12 @@ public function getUploadDangerousGoodsReply(ComplexType\UploadDangerousGoodsReq
if ($returnStdClass) {
return $response;
}

$uploadDangerousGoodsReply = new ComplexType\UploadDangerousGoodsReply;
$uploadDangerousGoodsReply->populateFromStdClass($response);
return $uploadDangerousGoodsReply;
}

/**
* Sends the ModifyDangerousGoodsHandlingUnitRequest and returns the response
*
Expand All @@ -87,12 +87,12 @@ public function getModifyDangerousGoodsHandlingUnitReply(ComplexType\ModifyDange
if ($returnStdClass) {
return $response;
}

$modifyDangerousGoodsHandlingUnitReply = new ComplexType\ModifyDangerousGoodsHandlingUnitReply;
$modifyDangerousGoodsHandlingUnitReply->populateFromStdClass($response);
return $modifyDangerousGoodsHandlingUnitReply;
}

/**
* Sends the DeleteDangerousGoodsHandlingUnitRequest and returns the response
*
Expand All @@ -106,12 +106,12 @@ public function getDeleteDangerousGoodsHandlingUnitReply(ComplexType\DeleteDange
if ($returnStdClass) {
return $response;
}

$deleteDangerousGoodsHandlingUnitReply = new ComplexType\DeleteDangerousGoodsHandlingUnitReply;
$deleteDangerousGoodsHandlingUnitReply->populateFromStdClass($response);
return $deleteDangerousGoodsHandlingUnitReply;
}

/**
* Sends the DeleteDangerousGoodsRequest and returns the response
*
Expand All @@ -125,12 +125,12 @@ public function getDeleteDangerousGoodsReply(ComplexType\DeleteDangerousGoodsReq
if ($returnStdClass) {
return $response;
}

$deleteDangerousGoodsReply = new ComplexType\DeleteDangerousGoodsReply;
$deleteDangerousGoodsReply->populateFromStdClass($response);
return $deleteDangerousGoodsReply;
}

/**
* Sends the RetrieveDangerousGoodsRequest and returns the response
*
Expand All @@ -144,26 +144,26 @@ public function getRetrieveDangerousGoodsReply(ComplexType\RetrieveDangerousGood
if ($returnStdClass) {
return $response;
}

$retrieveDangerousGoodsReply = new ComplexType\RetrieveDangerousGoodsReply;
$retrieveDangerousGoodsReply->populateFromStdClass($response);
return $retrieveDangerousGoodsReply;
}

/**
* Sends the alidateDangerousGoods and returns the response
* Sends the ValidateDangerousGoodsRequest and returns the response
*
* @param ComplexType\alidateDangerousGoods $alidateDangerousGoods
* @param ComplexType\ValidateDangerousGoodsRequest $validateDangerousGoodsRequest
* @param bool $returnStdClass Return the $stdClass response directly from \SoapClient
* @return ComplexType\ValidateDangerousGoodsReply|stdClass
*/
public function getReply(ComplexType\alidateDangerousGoods $alidateDangerousGoods, $returnStdClass = false)
public function getValidateDangerousGoodsReply(ComplexType\ValidateDangerousGoodsRequest $validateDangerousGoodsRequest, $returnStdClass = false)
{
$response = $this->getSoapClient()->$alidateDangerousGoods->toArray();
$response = $this->getSoapClient()->validateDangerousGoods($validateDangerousGoodsRequest->toArray());
if ($returnStdClass) {
return $response;
}

$validateDangerousGoodsReply = new ComplexType\ValidateDangerousGoodsReply;
$validateDangerousGoodsReply->populateFromStdClass($response);
return $validateDangerousGoodsReply;
Expand Down
6 changes: 3 additions & 3 deletions src/FedEx/_wsdl/DGDS_v3.wsdl
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@
<input message="ns:RetrieveDangerousGoodsRequest"/>
<output message="ns:RetrieveDangerousGoodsReply"/>
</operation>
<operation name="validateDangerousGoods " parameterOrder="ValidateDangerousGoodsRequest">
<operation name="validateDangerousGoods" parameterOrder="ValidateDangerousGoodsRequest">
<input message="ns:ValidateDangerousGoodsRequest"/>
<output message="ns:ValidateDangerousGoodsReply"/>
</operation>
Expand Down Expand Up @@ -1249,8 +1249,8 @@
<s1:body use="literal"/>
</output>
</operation>
<operation name="validateDangerousGoods ">
<s1:operation soapAction="http://fedex.com/ws/dgds/v3/validateDangerousGoods " style="document"/>
<operation name="validateDangerousGoods">
<s1:operation soapAction="http://fedex.com/ws/dgds/v3/validateDangerousGoods" style="document"/>
<input>
<s1:body use="literal"/>
</input>
Expand Down
2 changes: 2 additions & 0 deletions util/Cli/GenerateCode/Command/GenerateCode.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
ini_set("soap.wsdl_cache_enabled", 0);

if (!isset($_SERVER['PWD'])) {
throw new \Exception('Cannot determin current working directory. Make sure you run this script from command line.');
}
Expand Down

0 comments on commit 77381bd

Please sign in to comment.