@@ -309,19 +309,20 @@ public function testReturnFromPaypalButton()
309
309
310
310
$ shippingAddress = $ quote ->getShippingAddress ();
311
311
$ billingAddress = $ quote ->getBillingAddress ();
312
+ $ exportedShippingData = $ this ->getExportedData ()['shipping ' ];
312
313
$ prefix = '' ;
313
314
314
- $ this ->assertEquals ([$ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['street ' ]], $ shippingAddress ->getStreet ());
315
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['firstname ' ], $ shippingAddress ->getFirstname ());
316
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['city ' ], $ shippingAddress ->getCity ());
317
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['telephone ' ], $ shippingAddress ->getTelephone ());
318
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['email ' ], $ shippingAddress ->getEmail ());
319
-
320
- $ this ->assertEquals ([$ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['street ' ]], $ billingAddress ->getStreet ());
321
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['firstname ' ], $ billingAddress ->getFirstname ());
322
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['city ' ], $ billingAddress ->getCity ());
323
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['telephone ' ], $ billingAddress ->getTelephone ());
324
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['email ' ], $ billingAddress ->getEmail ());
315
+ $ this ->assertEquals ([$ prefix . $ exportedShippingData ['street ' ]], $ shippingAddress ->getStreet ());
316
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['firstname ' ], $ shippingAddress ->getFirstname ());
317
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['city ' ], $ shippingAddress ->getCity ());
318
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['telephone ' ], $ shippingAddress ->getTelephone ());
319
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['email ' ], $ shippingAddress ->getEmail ());
320
+
321
+ $ this ->assertEquals ([$ prefix . $ exportedShippingData ['street ' ]], $ billingAddress ->getStreet ());
322
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['firstname ' ], $ billingAddress ->getFirstname ());
323
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['city ' ], $ billingAddress ->getCity ());
324
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['telephone ' ], $ billingAddress ->getTelephone ());
325
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['email ' ], $ billingAddress ->getEmail ());
325
326
}
326
327
327
328
/**
@@ -347,19 +348,21 @@ public function testReturnFromPaypalButtonWithReturnBillingAddress()
347
348
348
349
$ shippingAddress = $ quote ->getShippingAddress ();
349
350
$ billingAddress = $ quote ->getBillingAddress ();
351
+ $ exportedBillingData = $ this ->getExportedData ()['billing ' ];
352
+ $ exportedShippingData = $ this ->getExportedData ()['shipping ' ];
350
353
$ prefix = '' ;
351
354
352
- $ this ->assertEquals ([$ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['street ' ]], $ shippingAddress ->getStreet ());
353
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['firstname ' ], $ shippingAddress ->getFirstname ());
354
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['city ' ], $ shippingAddress ->getCity ());
355
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['telephone ' ], $ shippingAddress ->getTelephone ());
356
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' shipping ' ] ['email ' ], $ shippingAddress ->getEmail ());
357
-
358
- $ this ->assertEquals ([$ prefix . $ this -> getExportedData ()[ ' billing ' ] ['street ' ]], $ billingAddress ->getStreet ());
359
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' billing ' ] ['firstname ' ], $ billingAddress ->getFirstname ());
360
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' billing ' ] ['city ' ], $ billingAddress ->getCity ());
361
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' billing ' ] ['telephone ' ], $ billingAddress ->getTelephone ());
362
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' billing ' ] ['email ' ], $ billingAddress ->getEmail ());
355
+ $ this ->assertEquals ([$ prefix . $ exportedShippingData ['street ' ]], $ shippingAddress ->getStreet ());
356
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['firstname ' ], $ shippingAddress ->getFirstname ());
357
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['city ' ], $ shippingAddress ->getCity ());
358
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['telephone ' ], $ shippingAddress ->getTelephone ());
359
+ $ this ->assertEquals ($ prefix . $ exportedShippingData ['email ' ], $ shippingAddress ->getEmail ());
360
+
361
+ $ this ->assertEquals ([$ prefix . $ exportedBillingData ['street ' ]], $ billingAddress ->getStreet ());
362
+ $ this ->assertEquals ($ prefix . $ exportedBillingData ['firstname ' ], $ billingAddress ->getFirstname ());
363
+ $ this ->assertEquals ($ prefix . $ exportedBillingData ['city ' ], $ billingAddress ->getCity ());
364
+ $ this ->assertEquals ($ prefix . $ exportedBillingData ['telephone ' ], $ billingAddress ->getTelephone ());
365
+ $ this ->assertEquals ($ prefix . $ exportedBillingData ['email ' ], $ billingAddress ->getEmail ());
363
366
}
364
367
365
368
/**
@@ -423,16 +426,17 @@ public function testReturnFromPaypalIfCheckoutWithReturnBillingAddress()
423
426
424
427
$ shippingAddress = $ quote ->getShippingAddress ();
425
428
$ billingAddress = $ quote ->getBillingAddress ();
429
+ $ exportedBillingData = $ this ->getExportedData ()['billing ' ];
426
430
427
431
$ this ->assertEquals ($ originalShippingAddress ->getStreet (), $ shippingAddress ->getStreet ());
428
432
$ this ->assertEquals ($ originalShippingAddress ->getFirstname (), $ shippingAddress ->getFirstname ());
429
433
$ this ->assertEquals ($ originalShippingAddress ->getCity (), $ shippingAddress ->getCity ());
430
434
$ this ->assertEquals ($ originalShippingAddress ->getTelephone (), $ shippingAddress ->getTelephone ());
431
435
432
- $ this ->assertEquals ([$ prefix . $ this -> getExportedData ()[ ' billing ' ] ['street ' ]], $ billingAddress ->getStreet ());
433
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' billing ' ] ['firstname ' ], $ billingAddress ->getFirstname ());
434
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' billing ' ] ['city ' ], $ billingAddress ->getCity ());
435
- $ this ->assertEquals ($ prefix . $ this -> getExportedData ()[ ' billing ' ] ['telephone ' ], $ billingAddress ->getTelephone ());
436
+ $ this ->assertEquals ([$ prefix . $ exportedBillingData ['street ' ]], $ billingAddress ->getStreet ());
437
+ $ this ->assertEquals ($ prefix . $ exportedBillingData ['firstname ' ], $ billingAddress ->getFirstname ());
438
+ $ this ->assertEquals ($ prefix . $ exportedBillingData ['city ' ], $ billingAddress ->getCity ());
439
+ $ this ->assertEquals ($ prefix . $ exportedBillingData ['telephone ' ], $ billingAddress ->getTelephone ());
436
440
}
437
441
438
442
/**
0 commit comments