@@ -18,7 +18,7 @@ |
||
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * @param $method |
|
| 21 | + * @param string $method |
|
| 22 | 22 | * @return \Magium\Magento\Actions\Checkout\PaymentMethods\PaymentMethodInterface |
| 23 | 23 | */ |
| 24 | 24 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | // If we are passed just the class name we will prepend it with Magium\Magento\Actions\Checkout\PaymentMethods |
| 29 | 29 | if (strpos($method, '\\') === false) { |
| 30 | - $method = 'Magium\Magento\Actions\Checkout\PaymentMethods\\' . $method; |
|
| 30 | + $method = 'Magium\Magento\Actions\Checkout\PaymentMethods\\'.$method; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | if (is_subclass_of($method, 'Magium\Magento\Actions\Checkout\PaymentMethods\PaymentMethodInterface')) { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | // If we are passed just the class name we will prepend it with Magium\Magento\Actions\Checkout\PaymentMethods |
| 71 | 71 | if (strpos($method, '\\') === false) { |
| 72 | - $method = 'Magium\Magento\Actions\Checkout\ShippingMethods\\' . $method; |
|
| 72 | + $method = 'Magium\Magento\Actions\Checkout\ShippingMethods\\'.$method; |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | if (is_subclass_of($method, 'Magium\Magento\Actions\Checkout\ShippingMethods\ShippingMethodInterface')) { |
@@ -86,12 +86,12 @@ discard block |
||
| 86 | 86 | if ($reflection->isSubclassOf('Magium\Magento\Themes\NavigableThemeInterface')) { |
| 87 | 87 | // Not entirely sure of hardcoding the various interface types. May make this configurable |
| 88 | 88 | parent::switchThemeConfiguration($fullyQualifiedClassName); |
| 89 | - $this->setTypePreference('Magium\Magento\Themes\AbstractThemeConfiguration',$fullyQualifiedClassName); |
|
| 90 | - $this->setTypePreference('Magium\Magento\Themes\NavigableThemeInterface',$fullyQualifiedClassName); |
|
| 91 | - $this->setTypePreference('Magium\Themes\BaseThemeInterface',$fullyQualifiedClassName); |
|
| 89 | + $this->setTypePreference('Magium\Magento\Themes\AbstractThemeConfiguration', $fullyQualifiedClassName); |
|
| 90 | + $this->setTypePreference('Magium\Magento\Themes\NavigableThemeInterface', $fullyQualifiedClassName); |
|
| 91 | + $this->setTypePreference('Magium\Themes\BaseThemeInterface', $fullyQualifiedClassName); |
|
| 92 | 92 | |
| 93 | - $this->setTypePreference('Magium\Magento\Themes\Customer\AbstractThemeConfiguration',$this->getTheme()->getCustomerThemeClass()); |
|
| 94 | - $this->setTypePreference('Magium\Magento\Themes\OnePageCheckout\AbstractThemeConfiguration',$this->getTheme()->getCheckoutThemeClass()); |
|
| 93 | + $this->setTypePreference('Magium\Magento\Themes\Customer\AbstractThemeConfiguration', $this->getTheme()->getCustomerThemeClass()); |
|
| 94 | + $this->setTypePreference('Magium\Magento\Themes\OnePageCheckout\AbstractThemeConfiguration', $this->getTheme()->getCheckoutThemeClass()); |
|
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | } else { |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | ]; |
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | - * @param string $active |
|
| 27 | 26 | */ |
| 28 | 27 | public function setEnabled($enabled) |
| 29 | 28 | { |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | const NAME = 'Cash On Delivery Payment'; |
| 9 | 9 | const ACTION = 'Admin\Configuration\PaymentMethods\CashOnDelivery'; |
| 10 | 10 | |
| 11 | - protected $section = 'Payment Methods/' . self::NAME; |
|
| 11 | + protected $section = 'Payment Methods/'.self::NAME; |
|
| 12 | 12 | |
| 13 | 13 | protected $settings = [ |
| 14 | 14 | 'payment_cashondelivery_active' => 0, |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | * * Tab/Section::name=Text Of Setting (will ensure that the correct section is navigated to, uses setting name (exact), not ID) |
| 58 | 58 | * * name=Text Of Setting (will not navigate, uses setting name (exact) not ID) |
| 59 | 59 | * |
| 60 | - * @param $identifier |
|
| 60 | + * @param string $identifier |
|
| 61 | 61 | * @param $value |
| 62 | 62 | * @throws \Magium\InvalidInstructionException |
| 63 | 63 | */ |
@@ -2,8 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Magium\Magento\Actions\Admin\Configuration; |
| 4 | 4 | |
| 5 | -use Facebook\WebDriver\WebDriverElement; |
|
| 6 | -use Facebook\WebDriver\WebDriverSelect; |
|
| 7 | 5 | use Magium\Magento\AbstractMagentoTestCase; |
| 8 | 6 | use Magium\Magento\Navigators\Admin\SystemConfiguration; |
| 9 | 7 | use Magium\Magento\Themes\Admin\ThemeConfiguration; |
@@ -77,7 +77,7 @@ |
||
| 77 | 77 | $xpath = ''; |
| 78 | 78 | if (count($xpath) === 2) { |
| 79 | 79 | $nav = explode('/', $parts[0]); |
| 80 | - $xpath = $this->themeConfiguration->getSystemConfigSectionDisplayCheckXpath($nav[1]) . '/descendant::'; |
|
| 80 | + $xpath = $this->themeConfiguration->getSystemConfigSectionDisplayCheckXpath($nav[1]).'/descendant::'; |
|
| 81 | 81 | } |
| 82 | 82 | $xpath .= $this->themeConfiguration->getSystemConfigSettingLabelXpath($matches[1]); |
| 83 | 83 | $labelElement = $this->webDriver->byXpath($xpath); |
@@ -2,10 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Magium\Magento\Actions\Cart; |
| 4 | 4 | |
| 5 | -use Magium\Actions\WaitForPageLoaded; |
|
| 6 | 5 | use Magium\Magento\Extractors\Catalog\Cart\AddToCart; |
| 7 | 6 | use Magium\Magento\Extractors\Catalog\Product\ConfigurableProductOptions; |
| 8 | -use Magium\Magento\Extractors\Catalog\Product\Swatch; |
|
| 9 | 7 | use Magium\Magento\Extractors\Catalog\Product\Option; |
| 10 | 8 | use Magium\Magento\Extractors\Catalog\Product\SwatchValue; |
| 11 | 9 | use Magium\Magento\Extractors\Catalog\Product\Value; |
@@ -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) { |
@@ -96,7 +96,6 @@ |
||
| 96 | 96 | /** |
| 97 | 97 | * Adds as configurable product to the cart from the product page. |
| 98 | 98 | * |
| 99 | - * @param array $options |
|
| 100 | 99 | */ |
| 101 | 100 | |
| 102 | 101 | public function addConfigurableItemToCartFromProductPage($categoryNavigationPath = null) |
@@ -6,8 +6,6 @@ |
||
| 6 | 6 | use Magium\Magento\Actions\Checkout\Steps\LogInCustomer; |
| 7 | 7 | use Magium\Magento\Actions\Checkout\Steps\PaymentMethod; |
| 8 | 8 | use Magium\Magento\Actions\Checkout\Steps\PlaceOrder; |
| 9 | -use Magium\Magento\Actions\Checkout\Steps\ReviewOrder; |
|
| 10 | -use Magium\Magento\Actions\Checkout\Steps\SelectCustomerCheckout; |
|
| 11 | 9 | use Magium\Magento\Actions\Checkout\Steps\ShippingAddress; |
| 12 | 10 | use Magium\Magento\Actions\Checkout\Steps\ShippingMethod; |
| 13 | 11 | use Magium\Magento\Extractors\Checkout\CartSummary; |
@@ -5,7 +5,6 @@ discard block |
||
| 5 | 5 | use Magium\Magento\Actions\Checkout\Steps\BillingAddress; |
| 6 | 6 | use Magium\Magento\Actions\Checkout\Steps\PaymentMethod; |
| 7 | 7 | use Magium\Magento\Actions\Checkout\Steps\PlaceOrder; |
| 8 | -use Magium\Magento\Actions\Checkout\Steps\ReviewOrder; |
|
| 9 | 8 | use Magium\Magento\Actions\Checkout\Steps\SelectGuestCheckout; |
| 10 | 9 | use Magium\Magento\Actions\Checkout\Steps\ShippingAddress; |
| 11 | 10 | use Magium\Magento\Actions\Checkout\Steps\ShippingMethod; |
@@ -14,7 +13,6 @@ discard block |
||
| 14 | 13 | use Magium\Magento\Navigators\Checkout\Checkout; |
| 15 | 14 | use Magium\Magento\Navigators\Checkout\CheckoutStart; |
| 16 | 15 | use Magium\Magento\Themes\OnePageCheckout\AbstractThemeConfiguration; |
| 17 | -use Magium\Magento\Themes\OnePageCheckout\ThemeConfiguration as OnePageCheckoutTheme; |
|
| 18 | 16 | |
| 19 | 17 | class GuestCheckout extends AbstractCheckout |
| 20 | 18 | { |
@@ -6,8 +6,6 @@ discard block |
||
| 6 | 6 | use Magium\Magento\Actions\Checkout\Steps\NewCustomerPassword; |
| 7 | 7 | use Magium\Magento\Actions\Checkout\Steps\PaymentMethod; |
| 8 | 8 | use Magium\Magento\Actions\Checkout\Steps\PlaceOrder; |
| 9 | -use Magium\Magento\Actions\Checkout\Steps\ReviewOrder; |
|
| 10 | -use Magium\Magento\Actions\Checkout\Steps\SelectCustomerCheckout; |
|
| 11 | 9 | use Magium\Magento\Actions\Checkout\Steps\SelectRegisterNewCustomerCheckout; |
| 12 | 10 | use Magium\Magento\Actions\Checkout\Steps\ShippingAddress; |
| 13 | 11 | use Magium\Magento\Actions\Checkout\Steps\ShippingMethod; |
@@ -16,7 +14,6 @@ discard block |
||
| 16 | 14 | use Magium\Magento\Navigators\Checkout\Checkout; |
| 17 | 15 | use Magium\Magento\Navigators\Checkout\CheckoutStart; |
| 18 | 16 | use Magium\Magento\Themes\OnePageCheckout\AbstractThemeConfiguration; |
| 19 | -use Magium\Magento\Themes\OnePageCheckout\ThemeConfiguration as OnePageCheckoutTheme; |
|
| 20 | 17 | |
| 21 | 18 | class RegisterNewCustomerCheckout extends AbstractCheckout |
| 22 | 19 | { |
@@ -43,6 +43,9 @@ |
||
| 43 | 43 | return $this->messages; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | + /** |
|
| 47 | + * @param string $message |
|
| 48 | + */ |
|
| 46 | 49 | public function addMessage($message) |
| 47 | 50 | { |
| 48 | 51 | $this->messages[] = $message; |