@@ -8,20 +8,20 @@ discard block |
||
8 | 8 | class ThemeConfiguration extends AbstractThemeConfiguration |
9 | 9 | { |
10 | 10 | |
11 | - public $accountNavigationXpath = '//div[contains(concat(" ",normalize-space(@class)," ")," block-account ")]/descendant::a[.="%s"]'; |
|
11 | + public $accountNavigationXpath = '//div[contains(concat(" ",normalize-space(@class)," ")," block-account ")]/descendant::a[.="%s"]'; |
|
12 | 12 | public $accountSectionHeaderXpath = '//div[contains(concat(" ",normalize-space(@class)," ")," col-main ")]/descendant::h1[.="%s"]'; |
13 | 13 | |
14 | - public $orderPageName = '{{My Orders}}'; |
|
14 | + public $orderPageName = '{{My Orders}}'; |
|
15 | 15 | |
16 | 16 | public $viewOrderLinkXpath = '//td[.="%s"]/../td/descendant::a[.="{{View Order}}"]'; |
17 | 17 | |
18 | - public $orderPageTitleContainsText = '{{Order}} #'; |
|
18 | + public $orderPageTitleContainsText = '{{Order}} #'; |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @var array Instructions in an Xpath array syntax to get to the customer registration page |
22 | 22 | */ |
23 | 23 | |
24 | - public $registrationNavigationInstructions = [ |
|
24 | + public $registrationNavigationInstructions = [ |
|
25 | 25 | [\Magium\WebDriver\WebDriver::INSTRUCTION_MOUSE_CLICK, '//div[@class="account-cart-wrapper"]/descendant::span[.="Account"]'], |
26 | 26 | [\Magium\WebDriver\WebDriver::INSTRUCTION_MOUSE_CLICK, '//div[@id="header-account"]/descendant::a[@title="Register"]'] |
27 | 27 | ]; |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * @var array Instructions in an Xpath array syntax to get to the customer registration page |
31 | 31 | */ |
32 | 32 | |
33 | - public $logoutNavigationInstructions = [ |
|
33 | + public $logoutNavigationInstructions = [ |
|
34 | 34 | [\Magium\WebDriver\WebDriver::INSTRUCTION_MOUSE_CLICK, '//div[@class="account-cart-wrapper"]/descendant::span[.="Account"]'], |
35 | 35 | [\Magium\WebDriver\WebDriver::INSTRUCTION_MOUSE_CLICK, '//div[@id="header-account"]/descendant::a[@title="Log Out"]'] |
36 | 36 | ]; |
@@ -49,13 +49,13 @@ discard block |
||
49 | 49 | * @var string Xpath for the customer email form element |
50 | 50 | */ |
51 | 51 | |
52 | - public $loginUsernameField = '//input[@type="text" and @id="email"]'; |
|
52 | + public $loginUsernameField = '//input[@type="text" and @id="email"]'; |
|
53 | 53 | |
54 | 54 | /** |
55 | 55 | * @var string Xpath for the customer password form element |
56 | 56 | */ |
57 | 57 | |
58 | - public $loginPasswordField = '//input[@type="password" and @id="pass"]'; |
|
58 | + public $loginPasswordField = '//input[@type="password" and @id="pass"]'; |
|
59 | 59 | |
60 | 60 | |
61 | 61 | /** |
@@ -70,19 +70,19 @@ discard block |
||
70 | 70 | public $orderShippingMethod = '//h2[.="{{Shipping Method}}"]/../../descendant::div[contains(concat(" ",normalize-space(@class)," ")," box-content ")]'; |
71 | 71 | public $orderPaymentMethod = '//h2[.="{{Payment Method}}"]/../../descendant::div[contains(concat(" ",normalize-space(@class)," ")," box-content ")]'; |
72 | 72 | |
73 | - public $orderItemNameXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::h3[contains(concat(" ",normalize-space(@class)," ")," product-name ")]'; |
|
73 | + public $orderItemNameXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::h3[contains(concat(" ",normalize-space(@class)," ")," product-name ")]'; |
|
74 | 74 | public $orderItemSkuXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[2]'; |
75 | - public $orderItemPriceXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[3]/descendant::span[@class="price"]'; |
|
75 | + public $orderItemPriceXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[3]/descendant::span[@class="price"]'; |
|
76 | 76 | public $orderItemQtyXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[4]'; |
77 | 77 | |
78 | 78 | public $orderItemQtyOrderedRegex = '/{{Ordered}}:\s+(\d+)/'; |
79 | 79 | public $orderItemQtyShippedRegex = '/{{Shipped}}:\s+(\d+)/'; |
80 | 80 | |
81 | - public $orderItemSubtotalXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[5]/descendant::span[@class="price"]'; |
|
81 | + public $orderItemSubtotalXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[5]/descendant::span[@class="price"]'; |
|
82 | 82 | |
83 | 83 | public $orderSubtotalXpath = '//table[@id="my-orders-table"]/descendant::tr[contains(concat(" ",normalize-space(@class)," ")," subtotal ")]/td[2]/span[@class="price"]'; |
84 | 84 | public $orderShippingAndHandlingXpath = '//table[@id="my-orders-table"]/descendant::tr[contains(concat(" ",normalize-space(@class)," ")," shipping ")]/td[2]/span[@class="price"]'; |
85 | - public $orderTaxXpath = '//table[@id="my-orders-table"]/descendant::td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/following-sibling::td[1]/span[@class="price"]'; |
|
85 | + public $orderTaxXpath = '//table[@id="my-orders-table"]/descendant::td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/following-sibling::td[1]/span[@class="price"]'; |
|
86 | 86 | public $orderGrandTotalXpath = '//table[@id="my-orders-table"]/descendant::tr[contains(concat(" ",normalize-space(@class)," ")," grand_total ")]/td[2]/descendant::span[@class="price"]'; |
87 | 87 | |
88 | 88 | public $orderDateXpath = '//p[@class="order-date"]'; |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | // public $navigationChildXPathSelector1 = 'li/descendant::span[.="{{%s}}"]'; |
24 | 24 | public $navigationChildXPathSelector = 'a[concat(" ",normalize-space(.)," ") = " {{%s}} "]/..'; |
25 | 25 | |
26 | - public $adminPopupMessageContainerXpath = '//*[@id="message-popup-window"]'; |
|
27 | - public $adminPopupMessageCloseButtonXpath = '//*[@id="message-popup-window"]/descendant::*[@title="close"]'; |
|
26 | + public $adminPopupMessageContainerXpath = '//*[@id="message-popup-window"]'; |
|
27 | + public $adminPopupMessageCloseButtonXpath = '//*[@id="message-popup-window"]/descendant::*[@title="close"]'; |
|
28 | 28 | |
29 | - public $systemConfigTabsXpath = '//ul[@id="system_config_tabs"]/descendant::a[concat(" ",normalize-space(.)," ") = " {{%s}} "]'; |
|
30 | - public $systemConfigSectionToggleXpath = '//form[@id="config_edit_form"]/descendant::div[contains(concat(" ",normalize-space(@class)," ")," section-config ")]/descendant::a[.="{{%s}}"]'; |
|
31 | - public $systemConfigSectionDisplayCheckXpath = '//legend[.="{{%s}}"]/ancestor::fieldset'; |
|
32 | - public $systemConfigToggleEnableXpath = '//legend[.="{{%s}}"]/../descendant::td[concat(" ",normalize-space(.)," ") = " {{Enabled}} "]/../td/descendant::select/option[@value="%d"]'; |
|
29 | + public $systemConfigTabsXpath = '//ul[@id="system_config_tabs"]/descendant::a[concat(" ",normalize-space(.)," ") = " {{%s}} "]'; |
|
30 | + public $systemConfigSectionToggleXpath = '//form[@id="config_edit_form"]/descendant::div[contains(concat(" ",normalize-space(@class)," ")," section-config ")]/descendant::a[.="{{%s}}"]'; |
|
31 | + public $systemConfigSectionDisplayCheckXpath = '//legend[.="{{%s}}"]/ancestor::fieldset'; |
|
32 | + public $systemConfigToggleEnableXpath = '//legend[.="{{%s}}"]/../descendant::td[concat(" ",normalize-space(.)," ") = " {{Enabled}} "]/../td/descendant::select/option[@value="%d"]'; |
|
33 | 33 | |
34 | - public $xTreeRootXpath = '//ul[contains(concat(" ",normalize-space(@class)," ")," x-tree-root-ct ")]/div/li[contains(concat(" ",normalize-space(@class)," ")," x-tree-node ")]/div/a'; |
|
35 | - public $xTreeNamedRootXpath = '//ul[contains(concat(" ",normalize-space(@class)," ")," x-tree-root-ct ")]/div/li[contains(concat(" ",normalize-space(@class)," ")," x-tree-node ")]/div/a[contains(concat("---",normalize-space(.)), "---{{%s}} (")]'; |
|
34 | + public $xTreeRootXpath = '//ul[contains(concat(" ",normalize-space(@class)," ")," x-tree-root-ct ")]/div/li[contains(concat(" ",normalize-space(@class)," ")," x-tree-node ")]/div/a'; |
|
35 | + public $xTreeNamedRootXpath = '//ul[contains(concat(" ",normalize-space(@class)," ")," x-tree-root-ct ")]/div/li[contains(concat(" ",normalize-space(@class)," ")," x-tree-node ")]/div/a[contains(concat("---",normalize-space(.)), "---{{%s}} (")]'; |
|
36 | 36 | public $xTreeChildXpath = 'ul/li[contains(concat(" ",normalize-space(@class)," ")," x-tree-node ")]/div/a/span[contains(concat("---",normalize-space(.)), "---{{%s}} (")]/..'; |
37 | 37 | public $xTreeChildNodePrefixXpath = '/../..'; |
38 | 38 | public $xTreeChildNodeExpandPrefixXpath = '/../img[contains(concat(" ",normalize-space(@class)," ")," x-tree-ec-icon ")]'; |
@@ -41,12 +41,12 @@ discard block |
||
41 | 41 | |
42 | 42 | public $systemConfigSaveSuccessfulXpath = '//li[@class="success-msg"]/descendant::span[.="{{The configuration has been saved}}."]'; |
43 | 43 | |
44 | - public $testLoggedInAtBaseUrl = '//a[@class="active"]/span[.="{{Dashboard}}"]'; |
|
44 | + public $testLoggedInAtBaseUrl = '//a[@class="active"]/span[.="{{Dashboard}}"]'; |
|
45 | 45 | |
46 | 46 | public $tableButtonXpath = '//table[@class="actions"]/descendant::span[.="{{%s}}"]'; |
47 | 47 | |
48 | 48 | public $selectOrderXpath = '//table[@id="sales_order_grid_table"]/descendant::td[concat(" ",normalize-space(.)," ") = " %s "]/../td/a[.="{{View}}"]'; |
49 | - public $selectCustomerXpath = '//table[@id="customerGrid_table"]/descendant::td[concat(" ",normalize-space(.)," ") = " %s "]/../td/a[.="{{Edit}}"]'; |
|
49 | + public $selectCustomerXpath = '//table[@id="customerGrid_table"]/descendant::td[concat(" ",normalize-space(.)," ") = " %s "]/../td/a[.="{{Edit}}"]'; |
|
50 | 50 | |
51 | 51 | public $systemConfigSettingLabelXpath = '//td[@class="label"]/label[.=" {{%s}}"]'; |
52 | 52 | |
@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | |
58 | 58 | public $guaranteedPageLoadedElementDisplayedXpath = '//div[@class="footer"]'; |
59 | 59 | |
60 | - public $successfulActionXpath = '//li[@class="success-msg"]'; |
|
60 | + public $successfulActionXpath = '//li[@class="success-msg"]'; |
|
61 | 61 | public $errorActionXpath = '//li[@class="error-msg"]'; |
62 | 62 | |
63 | 63 | public $shippingCarrierXpath = '//select[@name="tracking[%d][carrier_code]"]'; |
64 | - public $shippingTitleXpath = '//input[@name="tracking[%d][title]"]'; |
|
65 | - public $shippingTrackingNumberXpath = '//input[@name="tracking[%d][number]"]'; |
|
64 | + public $shippingTitleXpath = '//input[@name="tracking[%d][title]"]'; |
|
65 | + public $shippingTrackingNumberXpath = '//input[@name="tracking[%d][number]"]'; |
|
66 | 66 | |
67 | 67 | public $formButtonXpath = '//div[@class="content-header"]/p[@class="form-buttons"]/descendant::span[.="{{%s}}"]'; |
68 | 68 | |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * @var string |
244 | 244 | */ |
245 | 245 | |
246 | - public $searchButtonText = '{{Search}}'; |
|
246 | + public $searchButtonText = '{{Search}}'; |
|
247 | 247 | |
248 | 248 | /** |
249 | 249 | * @return Translator |
@@ -260,9 +260,9 @@ |
||
260 | 260 | return $this->translatePlaceholders($this->shippingMethodContinueButtonXpath); |
261 | 261 | } |
262 | 262 | |
263 | - /** |
|
264 | - * @return string |
|
265 | - */ |
|
263 | + /** |
|
264 | + * @return string |
|
265 | + */ |
|
266 | 266 | public function getPlaceOrderButtonXpath() |
267 | 267 | { |
268 | 268 | return $this->translatePlaceholders($this->placeOrderButtonXpath); |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | */ |
570 | 570 | public function getBillingAddressXpath() |
571 | 571 | { |
572 | - return$this->translatePlaceholders( $this->billingAddressXpath); |
|
572 | + return$this->translatePlaceholders($this->billingAddressXpath); |
|
573 | 573 | } |
574 | 574 | |
575 | 575 | /** |
@@ -677,7 +677,7 @@ discard block |
||
677 | 677 | */ |
678 | 678 | public function getCartSummaryCheckoutProductLoopPriceXpath($itemCount) |
679 | 679 | { |
680 | - $return = sprintf($this->cartSummaryCheckoutProductLoopPriceXpath , $itemCount); |
|
680 | + $return = sprintf($this->cartSummaryCheckoutProductLoopPriceXpath, $itemCount); |
|
681 | 681 | return $this->translatePlaceholders($return); |
682 | 682 | } |
683 | 683 | |
@@ -686,7 +686,7 @@ discard block |
||
686 | 686 | */ |
687 | 687 | public function getCartSummaryCheckoutProductLoopNameXpath($itemCount) |
688 | 688 | { |
689 | - $return = sprintf($this->cartSummaryCheckoutProductLoopNameXpath , $itemCount); |
|
689 | + $return = sprintf($this->cartSummaryCheckoutProductLoopNameXpath, $itemCount); |
|
690 | 690 | return $this->translatePlaceholders($return); |
691 | 691 | } |
692 | 692 | |
@@ -695,7 +695,7 @@ discard block |
||
695 | 695 | */ |
696 | 696 | public function getCartSummaryCheckoutProductLoopQtyXpath($itemCount) |
697 | 697 | { |
698 | - $return = sprintf($this->cartSummaryCheckoutProductLoopQtyXpath , $itemCount); |
|
698 | + $return = sprintf($this->cartSummaryCheckoutProductLoopQtyXpath, $itemCount); |
|
699 | 699 | return $this->translatePlaceholders($return); |
700 | 700 | } |
701 | 701 | |
@@ -704,7 +704,7 @@ discard block |
||
704 | 704 | */ |
705 | 705 | public function getCartSummaryCheckoutProductLoopSubtotalXpath($itemCount) |
706 | 706 | { |
707 | - $return = sprintf($this->cartSummaryCheckoutProductLoopSubtotalXpath , $itemCount); |
|
707 | + $return = sprintf($this->cartSummaryCheckoutProductLoopSubtotalXpath, $itemCount); |
|
708 | 708 | return $this->translatePlaceholders($return); |
709 | 709 | } |
710 | 710 |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
141 | - * @return mixed |
|
141 | + * @return string |
|
142 | 142 | */ |
143 | 143 | public function getTermsAndConditionsSelectorXpath($term) |
144 | 144 | { |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | /** |
332 | - * @param string $shippinFirstNameXpath |
|
332 | + * @param string $shippingFirstNameXpath |
|
333 | 333 | */ |
334 | 334 | public function setShippingFirstNameXpath($shippingFirstNameXpath) |
335 | 335 | { |
@@ -433,6 +433,7 @@ discard block |
||
433 | 433 | } |
434 | 434 | |
435 | 435 | /** |
436 | + * @param string $region |
|
436 | 437 | * @return string |
437 | 438 | */ |
438 | 439 | public function getShippingRegionIdXpath($region) |
@@ -466,6 +467,7 @@ discard block |
||
466 | 467 | } |
467 | 468 | |
468 | 469 | /** |
470 | + * @param string $country |
|
469 | 471 | * @return string |
470 | 472 | */ |
471 | 473 | public function getShippingCountryIdXpath($country) |
@@ -546,6 +548,9 @@ discard block |
||
546 | 548 | $this->shippingContinueCompletedXpath = $shippingContinueCompletedXpath; |
547 | 549 | } |
548 | 550 | |
551 | + /** |
|
552 | + * @return string |
|
553 | + */ |
|
549 | 554 | public function getBillingContinueCompletedXpath() |
550 | 555 | { |
551 | 556 | return $this->translatePlaceholders($this->billingContinueCompletedXpath); |
@@ -618,6 +623,7 @@ discard block |
||
618 | 623 | } |
619 | 624 | |
620 | 625 | /** |
626 | + * @param string $region |
|
621 | 627 | * @return string |
622 | 628 | */ |
623 | 629 | public function getBillingRegionIdXpath($region) |
@@ -635,6 +641,7 @@ discard block |
||
635 | 641 | } |
636 | 642 | |
637 | 643 | /** |
644 | + * @param string $country |
|
638 | 645 | * @return string |
639 | 646 | */ |
640 | 647 | public function getBillingCountryIdXpath($country) |
@@ -702,6 +709,7 @@ discard block |
||
702 | 709 | |
703 | 710 | |
704 | 711 | /** |
712 | + * @param integer $itemCount |
|
705 | 713 | * @return string |
706 | 714 | */ |
707 | 715 | public function getCartSummaryCheckoutProductLoopPriceXpath($itemCount) |
@@ -711,6 +719,7 @@ discard block |
||
711 | 719 | } |
712 | 720 | |
713 | 721 | /** |
722 | + * @param integer $itemCount |
|
714 | 723 | * @return string |
715 | 724 | */ |
716 | 725 | public function getCartSummaryCheckoutProductLoopNameXpath($itemCount) |
@@ -720,6 +729,7 @@ discard block |
||
720 | 729 | } |
721 | 730 | |
722 | 731 | /** |
732 | + * @param integer $itemCount |
|
723 | 733 | * @return string |
724 | 734 | */ |
725 | 735 | public function getCartSummaryCheckoutProductLoopQtyXpath($itemCount) |
@@ -729,6 +739,7 @@ discard block |
||
729 | 739 | } |
730 | 740 | |
731 | 741 | /** |
742 | + * @param integer $itemCount |
|
732 | 743 | * @return string |
733 | 744 | */ |
734 | 745 | public function getCartSummaryCheckoutProductLoopSubtotalXpath($itemCount) |
@@ -61,7 +61,7 @@ |
||
61 | 61 | // The options are sorted by their entry into the setOption() method. Need to have it ordered by the page order |
62 | 62 | |
63 | 63 | if (!$elementOption instanceof Option) { |
64 | - throw new InvalidConfigurableOptionException('Missing the attribute: ' . $attributeName); |
|
64 | + throw new InvalidConfigurableOptionException('Missing the attribute: '.$attributeName); |
|
65 | 65 | } |
66 | 66 | $element = $elementOption->getValue($this->getOption($attributeName)); |
67 | 67 | if (!$element instanceof Value) { |
@@ -57,7 +57,9 @@ |
||
57 | 57 | $attributes = $this->option->getOptionNames(); |
58 | 58 | foreach ($attributes as $attributeName) { |
59 | 59 | $elementOption = $this->option->getOption($attributeName); |
60 | - if (!$elementOption) continue; |
|
60 | + if (!$elementOption) { |
|
61 | + continue; |
|
62 | + } |
|
61 | 63 | // The options are sorted by their entry into the setOption() method. Need to have it ordered by the page order |
62 | 64 | |
63 | 65 | if (!$elementOption instanceof Option) { |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Magium\Actions\StaticActionInterface; |
6 | 6 | use Magium\Magento\Extractors\Catalog\Cart\AddToCart; |
7 | 7 | use Magium\Magento\Extractors\Catalog\Product\ConfigurableProductOptions; |
8 | -use Magium\Magento\Extractors\Catalog\Product\Swatch; |
|
9 | 8 | use Magium\Magento\Extractors\Catalog\Product\Option; |
10 | 9 | use Magium\Magento\Extractors\Catalog\Product\SwatchValue; |
11 | 10 | use Magium\Magento\Extractors\Catalog\Product\Value; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | { |
49 | 49 | if ($this->requireQty || $this->addQty > 1) { |
50 | 50 | if (!$this->webDriver->elementExists($this->theme->getSimpleProductQtyXpath(), WebDriver::BY_XPATH)) { |
51 | - throw new NoSuchElementException('Could not find the simple add to cart element with the Xpath: ' . $this->theme->getAddToCartXpath()); |
|
51 | + throw new NoSuchElementException('Could not find the simple add to cart element with the Xpath: '.$this->theme->getAddToCartXpath()); |
|
52 | 52 | } |
53 | 53 | $element = $this->webDriver->byXpath($this->theme->getSimpleProductQtyXpath()); |
54 | 54 | $element->clear(); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | try { |
67 | 67 | $element->click(); |
68 | 68 | } catch (\Exception $e) { |
69 | - $e2 = $this->webDriver->byXpath($this->theme->getAddToCartXpath() . '/ancestor::li'); |
|
69 | + $e2 = $this->webDriver->byXpath($this->theme->getAddToCartXpath().'/ancestor::li'); |
|
70 | 70 | $this->webDriver->getMouse()->mouseMove($e2->getCoordinates()); |
71 | 71 | $element->click(); |
72 | 72 | } |
@@ -2,4 +2,4 @@ |
||
2 | 2 | |
3 | 3 | namespace Magium\Magento\Actions\Cart; |
4 | 4 | |
5 | -class AddToCartFailedException extends NoSuchElementException {} |
|
6 | 5 | \ No newline at end of file |
6 | +class AddToCartFailedException extends NoSuchElementException {} |
|
7 | 7 | \ No newline at end of file |
@@ -49,7 +49,7 @@ |
||
49 | 49 | $this->testCase->assertElementDisplayed($this->theme->getContactUsSubmitXpath(), WebDriver::BY_XPATH); |
50 | 50 | |
51 | 51 | $this->webDriver->byXpath($this->theme->getContactUsNameXpath())->clear()->sendKeys( |
52 | - $this->customer->getFirstName() . ' ' . $this->customer->getLastName() |
|
52 | + $this->customer->getFirstName().' '.$this->customer->getLastName() |
|
53 | 53 | ); |
54 | 54 | |
55 | 55 | $this->webDriver->byXpath($this->theme->getContactUsEmailXpath())->clear()->sendKeys( |
@@ -44,10 +44,14 @@ |
||
44 | 44 | foreach ($this->steps as $step) { |
45 | 45 | if ($step instanceof StepInterface) { |
46 | 46 | $continue = $step->execute(); |
47 | - if (!$continue) return; |
|
47 | + if (!$continue) { |
|
48 | + return; |
|
49 | + } |
|
48 | 50 | |
49 | 51 | $continue = $step->nextAction(); |
50 | - if (!$continue) return; |
|
52 | + if (!$continue) { |
|
53 | + return; |
|
54 | + } |
|
51 | 55 | } |
52 | 56 | } |
53 | 57 | } |
@@ -19,7 +19,7 @@ |
||
19 | 19 | self::TYPE_VISA => '4007000000027', |
20 | 20 | self::TYPE_AMERICAN_EXPRESS => '370000000000002', |
21 | 21 | self::TYPE_DISCOVER => '6011000000000012', |
22 | - self::TYPE_MASTERCARD => '5424000000000015', |
|
22 | + self::TYPE_MASTERCARD => '5424000000000015', |
|
23 | 23 | self::TYPE_UNKNOWN => '0000000000000000' |
24 | 24 | ]; |
25 | 25 |
@@ -35,7 +35,7 @@ |
||
35 | 35 | protected function configureType($type) |
36 | 36 | { |
37 | 37 | if (!isset($this->ccNums[$type])) { |
38 | - throw new InvalidPaymentInformationException('Unknown payment type: ' . $type); |
|
38 | + throw new InvalidPaymentInformationException('Unknown payment type: '.$type); |
|
39 | 39 | } |
40 | 40 | $this->setCreditCardNumber($this->ccNums[$type]); |
41 | 41 | $this->setType($type); |