Skip to content

Commit df4f68a

Browse files
author
Jacob Barber
committed
Address validation now uses wsdl v3
1 parent e6c683f commit df4f68a

15 files changed

+708
-124
lines changed

src/FedEx/AddressValidationService/ComplexType/Address.php

+31-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use FedEx\AbstractComplexType;
55

66
/**
7-
* The descriptive data for a physical location.
7+
* Descriptive data for a physical location. May be used as an actual physical address (place to which one could go), or as a container of "address parts" which should be handled as a unit (such as a city-state-ZIP combination within the US).
88
*
99
* @author Jeremy Dunn <[email protected]>
1010
* @package PHP FedEx API wrapper
@@ -88,7 +88,7 @@ public function getStateOrProvinceCode()
8888
}
8989

9090
/**
91-
* Identification of a region (usually small) for mail/package delivery. Format and presence of this field will vary, depending on country. This element is required if both the City and StateOrProvinceCode are not present.
91+
* Identification of a region (usually small) for mail/package delivery. Format and presence of this field will vary, depending on country.
9292
*
9393
* @param string $postalCode
9494
* @return Address
@@ -100,7 +100,7 @@ public function setPostalCode($postalCode)
100100
}
101101

102102
/**
103-
* Returns Identification of a region (usually small) for mail/package delivery. Format and presence of this field will vary, depending on country. This element is required if both the City and StateOrProvinceCode are not present.
103+
* Returns Identification of a region (usually small) for mail/package delivery. Format and presence of this field will vary, depending on country.
104104
*
105105
* @return string
106106
*/
@@ -110,7 +110,7 @@ public function getPostalCode()
110110
}
111111

112112
/**
113-
* Relevant only to addresses in Puerto Rico. In Puerto Rico, multiple addresses within the same ZIP code can have the same house number and street name. When this is the case, the urbanization code is needed to distinguish them.
113+
* Relevant only to addresses in Puerto Rico.
114114
*
115115
* @param string $urbanizationCode
116116
* @return Address
@@ -122,7 +122,7 @@ public function setUrbanizationCode($urbanizationCode)
122122
}
123123

124124
/**
125-
* Returns Relevant only to addresses in Puerto Rico. In Puerto Rico, multiple addresses within the same ZIP code can have the same house number and street name. When this is the case, the urbanization code is needed to distinguish them.
125+
* Returns Relevant only to addresses in Puerto Rico.
126126
*
127127
* @return string
128128
*/
@@ -132,7 +132,7 @@ public function getUrbanizationCode()
132132
}
133133

134134
/**
135-
* Identification of a country.
135+
* The two-letter code used to identify a country.
136136
*
137137
* @param string $countryCode
138138
* @return Address
@@ -144,7 +144,7 @@ public function setCountryCode($countryCode)
144144
}
145145

146146
/**
147-
* Returns Identification of a country.
147+
* Returns The two-letter code used to identify a country.
148148
*
149149
* @return string
150150
*/
@@ -154,7 +154,29 @@ public function getCountryCode()
154154
}
155155

156156
/**
157-
* Indicates whether this address is residential (as opposed to commercial).
157+
* The fully spelt out name of a country.
158+
*
159+
* @param string $countryName
160+
* @return Address
161+
*/
162+
public function setCountryName($countryName)
163+
{
164+
$this->CountryName = $countryName;
165+
return $this;
166+
}
167+
168+
/**
169+
* Returns The fully spelt out name of a country.
170+
*
171+
* @return string
172+
*/
173+
public function getCountryName()
174+
{
175+
return $this->CountryName;
176+
}
177+
178+
/**
179+
* Indicates whether this address residential (as opposed to commercial).
158180
*
159181
* @param boolean $residential
160182
* @return Address
@@ -166,7 +188,7 @@ public function setResidential($residential)
166188
}
167189

168190
/**
169-
* Returns Indicates whether this address is residential (as opposed to commercial).
191+
* Returns Indicates whether this address residential (as opposed to commercial).
170192
*
171193
* @return boolean
172194
*/

src/FedEx/AddressValidationService/ComplexType/AddressToValidate.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,47 @@ class AddressToValidate
2222
protected $_name = 'AddressToValidate';
2323

2424
/**
25-
* Set AddressId
25+
* A reference id provided by the client.
2626
*
27-
* @param string $addressId
27+
* @param string $clientReferenceId
2828
* @return AddressToValidate
2929
*/
30-
public function setAddressId($addressId)
30+
public function setClientReferenceId($clientReferenceId)
3131
{
32-
$this->AddressId = $addressId;
32+
$this->ClientReferenceId = $clientReferenceId;
3333
return $this;
3434
}
3535

3636
/**
37-
* Returns Set AddressId
37+
* Returns A reference id provided by the client.
3838
*
3939
* @return string
4040
*/
41-
public function getAddressId()
41+
public function getClientReferenceId()
4242
{
43-
return $this->AddressId;
43+
return $this->ClientReferenceId;
4444
}
4545

4646
/**
47-
* Set CompanyName
47+
* Set Contact
4848
*
49-
* @param string $companyName
49+
* @param Contact $contact
5050
* @return AddressToValidate
5151
*/
52-
public function setCompanyName($companyName)
52+
public function setContact(Contact $contact)
5353
{
54-
$this->CompanyName = $companyName;
54+
$this->Contact = $contact;
5555
return $this;
5656
}
5757

5858
/**
59-
* Returns Set CompanyName
59+
* Returns Set Contact
6060
*
61-
* @return string
61+
* @return Contact
6262
*/
63-
public function getCompanyName()
63+
public function getContact()
6464
{
65-
return $this->CompanyName;
65+
return $this->Contact;
6666
}
6767

6868
/**

src/FedEx/AddressValidationService/ComplexType/AddressValidationRequest.php

+15-37
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AddressValidationRequest
2222
protected $_name = 'AddressValidationRequest';
2323

2424
/**
25-
* The descriptive data to be used in authentication of the sender's identity (and right to use FedEx web services).
25+
* Descriptive data to be used in authentication of the sender's identity (and right to use FedEx web services).
2626
*
2727
* @param WebAuthenticationDetail $webAuthenticationDetail
2828
* @return AddressValidationRequest
@@ -34,7 +34,7 @@ public function setWebAuthenticationDetail(WebAuthenticationDetail $webAuthentic
3434
}
3535

3636
/**
37-
* Returns The descriptive data to be used in authentication of the sender's identity (and right to use FedEx web services).
37+
* Returns Descriptive data to be used in authentication of the sender's identity (and right to use FedEx web services).
3838
*
3939
* @return WebAuthenticationDetail
4040
*/
@@ -44,7 +44,7 @@ public function getWebAuthenticationDetail()
4444
}
4545

4646
/**
47-
* Descriptive data identifying the client submitting the transaction.
47+
* Set ClientDetail
4848
*
4949
* @param ClientDetail $clientDetail
5050
* @return AddressValidationRequest
@@ -56,7 +56,7 @@ public function setClientDetail(ClientDetail $clientDetail)
5656
}
5757

5858
/**
59-
* Returns Descriptive data identifying the client submitting the transaction.
59+
* Returns Set ClientDetail
6060
*
6161
* @return ClientDetail
6262
*/
@@ -66,7 +66,7 @@ public function getClientDetail()
6666
}
6767

6868
/**
69-
* Descriptive data for this customer transaction. The TransactionDetail from the request is echoed back to the caller in the corresponding reply.
69+
* Set TransactionDetail
7070
*
7171
* @param TransactionDetail $transactionDetail
7272
* @return AddressValidationRequest
@@ -78,7 +78,7 @@ public function setTransactionDetail(TransactionDetail $transactionDetail)
7878
}
7979

8080
/**
81-
* Returns Descriptive data for this customer transaction. The TransactionDetail from the request is echoed back to the caller in the corresponding reply.
81+
* Returns Set TransactionDetail
8282
*
8383
* @return TransactionDetail
8484
*/
@@ -88,7 +88,7 @@ public function getTransactionDetail()
8888
}
8989

9090
/**
91-
* Identifies the version/level of a service operation expected by a caller (in each request) and performed by the callee (in each reply).
91+
* Set Version
9292
*
9393
* @param VersionId $version
9494
* @return AddressValidationRequest
@@ -100,7 +100,7 @@ public function setVersion(VersionId $version)
100100
}
101101

102102
/**
103-
* Returns Identifies the version/level of a service operation expected by a caller (in each request) and performed by the callee (in each reply).
103+
* Returns Set Version
104104
*
105105
* @return VersionId
106106
*/
@@ -110,47 +110,25 @@ public function getVersion()
110110
}
111111

112112
/**
113-
* Set RequestTimestamp
113+
* Set InEffectAsOfTimestamp
114114
*
115-
* @param dateTime $requestTimestamp
115+
* @param dateTime $inEffectAsOfTimestamp
116116
* @return AddressValidationRequest
117117
*/
118-
public function setRequestTimestamp($requestTimestamp)
118+
public function setInEffectAsOfTimestamp($inEffectAsOfTimestamp)
119119
{
120-
$this->RequestTimestamp = $requestTimestamp;
120+
$this->InEffectAsOfTimestamp = $inEffectAsOfTimestamp;
121121
return $this;
122122
}
123123

124124
/**
125-
* Returns Set RequestTimestamp
125+
* Returns Set InEffectAsOfTimestamp
126126
*
127127
* @return dateTime
128128
*/
129-
public function getRequestTimestamp()
129+
public function getInEffectAsOfTimestamp()
130130
{
131-
return $this->RequestTimestamp;
132-
}
133-
134-
/**
135-
* Set Options
136-
*
137-
* @param AddressValidationOptions $options
138-
* @return AddressValidationRequest
139-
*/
140-
public function setOptions(AddressValidationOptions $options)
141-
{
142-
$this->Options = $options;
143-
return $this;
144-
}
145-
146-
/**
147-
* Returns Set Options
148-
*
149-
* @return AddressValidationOptions
150-
*/
151-
public function getOptions()
152-
{
153-
return $this->Options;
131+
return $this->InEffectAsOfTimestamp;
154132
}
155133

156134
/**

0 commit comments

Comments
 (0)