Skip to content

Commit 3434898

Browse files
author
Robert He
committed
MAGETWO-33665 : Refactor Quote module to use mutable data object interfaces
-- reverting changes to setStreet()
1 parent 2978776 commit 3434898

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

app/code/Magento/Customer/Model/Address/AbstractAddress.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,21 +232,21 @@ public function getStreetFull()
232232
/**
233233
* Alias for a street setter. To be used though setDataUsingMethod('street_full', $value).
234234
*
235-
* @param string[] $street
235+
* @param string|string[] $street
236236
* @return $this
237237
*/
238-
public function setStreetFull(array $street = null)
238+
public function setStreetFull($street)
239239
{
240240
return $this->setStreet($street);
241241
}
242242

243243
/**
244244
* Non-magic setter for a street field
245245
*
246-
* @param string[] $street
246+
* @param string|string[] $street
247247
* @return $this
248248
*/
249-
public function setStreet(array $street = null)
249+
public function setStreet($street)
250250
{
251251
$this->setData('street', $street);
252252
return $this;

app/code/Magento/Quote/Api/Data/AddressInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ public function getStreet();
135135
/**
136136
* Set street
137137
*
138-
* @param string[] $street
138+
* @param string|string[] $street
139139
* @return $this
140140
*/
141-
public function setStreet(array $street = null);
141+
public function setStreet($street);
142142

143143
/**
144144
* Get company

app/code/Magento/Quote/Model/Quote/Address.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,7 @@ public function getStreet()
13701370
/**
13711371
* {@inheritdoc}
13721372
*/
1373-
public function setStreet(array $street = null)
1373+
public function setStreet($street)
13741374
{
13751375
return $this->setData(self::KEY_STREET, $street);
13761376
}

dev/tests/integration/testsuite/Magento/Customer/_files/customer_address.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'country_id' => 'US',
1919
'city' => 'CityM',
2020
'company' => 'CompanyName',
21-
'street' => ['Green str, 67'],
21+
'street' => 'Green str, 67',
2222
'lastname' => 'Smith',
2323
'firstname' => 'John',
2424
'parent_id' => 1,

0 commit comments

Comments
 (0)