@@ -129,7 +129,6 @@ |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
132 | - * @param PromotionDynamicTypeInterface|null $type |
|
133 | 132 | * @param FormInterface $form |
134 | 133 | * |
135 | 134 | * @return null|string |
@@ -106,7 +106,7 @@ |
||
106 | 106 | * @param PaymentInterface $payment |
107 | 107 | * @param OrderInterface $order |
108 | 108 | * |
109 | - * @return PaymentMethodInterface|null |
|
109 | + * @return \Sylius\Component\Payment\Model\PaymentMethodInterface|null |
|
110 | 110 | */ |
111 | 111 | private function getDefaultPaymentMethod(PaymentInterface $payment, OrderInterface $order) |
112 | 112 | { |
@@ -81,7 +81,7 @@ |
||
81 | 81 | |
82 | 82 | /** |
83 | 83 | * @param string $field |
84 | - * @param mixed $value |
|
84 | + * @param string $value |
|
85 | 85 | * |
86 | 86 | * @return self |
87 | 87 | */ |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | $this->addSql('CREATE TABLE sylius_product_variant_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_8DC18EDC2C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_variant_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); |
35 | 35 | $this->addSql('ALTER TABLE sylius_product_variant_translation ADD CONSTRAINT FK_8DC18EDC2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_variant (id) ON DELETE CASCADE'); |
36 | - $this->addSql('INSERT INTO sylius_product_variant_translation (translatable_id, name, locale) SELECT id, name, "'.$defaultLocale.'" from sylius_product_variant WHERE sylius_product_variant.name IS NOT null'); |
|
36 | + $this->addSql('INSERT INTO sylius_product_variant_translation (translatable_id, name, locale) SELECT id, name, "' . $defaultLocale . '" from sylius_product_variant WHERE sylius_product_variant.name IS NOT null'); |
|
37 | 37 | $this->addSql('ALTER TABLE sylius_product_variant DROP name'); |
38 | 38 | } |
39 | 39 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); |
48 | 48 | |
49 | 49 | $this->addSql('ALTER TABLE sylius_product_variant ADD name VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci'); |
50 | - $this->addSql('UPDATE sylius_product_variant SET name = (SELECT name FROM sylius_product_variant_translation WHERE sylius_product_variant_translation.translatable_id = sylius_product_variant.id AND sylius_product_variant_translation.locale = "'.$defaultLocale.'")'); |
|
50 | + $this->addSql('UPDATE sylius_product_variant SET name = (SELECT name FROM sylius_product_variant_translation WHERE sylius_product_variant_translation.translatable_id = sylius_product_variant.id AND sylius_product_variant_translation.locale = "' . $defaultLocale . '")'); |
|
51 | 51 | $this->addSql('DROP TABLE sylius_product_variant_translation'); |
52 | 52 | } |
53 | 53 | } |
@@ -12,12 +12,12 @@ |
||
12 | 12 | namespace Sylius\Component\Core\Resolver; |
13 | 13 | |
14 | 14 | use Sylius\Component\Addressing\Matcher\ZoneMatcherInterface; |
15 | -use Sylius\Component\Core\Model\Scope; |
|
16 | 15 | use Sylius\Component\Core\Model\OrderInterface; |
16 | +use Sylius\Component\Core\Model\Scope; |
|
17 | 17 | use Sylius\Component\Core\Model\ShipmentInterface; |
18 | +use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface; |
|
18 | 19 | use Sylius\Component\Shipping\Checker\ShippingMethodEligibilityCheckerInterface; |
19 | 20 | use Sylius\Component\Shipping\Model\ShippingSubjectInterface; |
20 | -use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface; |
|
21 | 21 | use Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface; |
22 | 22 | use Webmozart\Assert\Assert; |
23 | 23 |
@@ -14,16 +14,16 @@ |
||
14 | 14 | use PhpSpec\ObjectBehavior; |
15 | 15 | use Sylius\Component\Addressing\Matcher\ZoneMatcherInterface; |
16 | 16 | use Sylius\Component\Addressing\Model\ZoneInterface; |
17 | -use Sylius\Component\Core\Model\Scope; |
|
18 | 17 | use Sylius\Component\Core\Model\AddressInterface; |
19 | 18 | use Sylius\Component\Core\Model\ChannelInterface; |
20 | 19 | use Sylius\Component\Core\Model\OrderInterface; |
20 | +use Sylius\Component\Core\Model\Scope; |
|
21 | 21 | use Sylius\Component\Core\Model\ShipmentInterface; |
22 | 22 | use Sylius\Component\Core\Model\ShippingMethodInterface; |
23 | +use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface; |
|
23 | 24 | use Sylius\Component\Core\Resolver\ZoneAndChannelBasedShippingMethodsResolver; |
24 | 25 | use Sylius\Component\Shipping\Checker\ShippingMethodEligibilityCheckerInterface; |
25 | 26 | use Sylius\Component\Shipping\Model\ShippingSubjectInterface; |
26 | -use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface; |
|
27 | 27 | use Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface; |
28 | 28 | |
29 | 29 | /** |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | |
37 | 37 | $this->addSql('CREATE TABLE sylius_product_association_type_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_4F618E52C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_association_type_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'); |
38 | 38 | $this->addSql('ALTER TABLE sylius_product_association_type_translation ADD CONSTRAINT FK_4F618E52C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_association_type (id) ON DELETE CASCADE'); |
39 | - $this->addSql('INSERT INTO sylius_product_association_type_translation (translatable_id, name, locale) SELECT id, name, "'.$defaultLocale.'" from sylius_product_association_type WHERE sylius_product_association_type.name IS NOT null'); |
|
39 | + $this->addSql('INSERT INTO sylius_product_association_type_translation (translatable_id, name, locale) SELECT id, name, "' . $defaultLocale . '" from sylius_product_association_type WHERE sylius_product_association_type.name IS NOT null'); |
|
40 | 40 | $this->addSql('ALTER TABLE sylius_product_association_type DROP name'); |
41 | 41 | } |
42 | 42 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $defaultLocale = $this->container->getParameter('locale'); |
51 | 51 | |
52 | 52 | $this->addSql('ALTER TABLE sylius_product_association_type ADD name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci'); |
53 | - $this->addSql('UPDATE sylius_product_association_type SET name = (SELECT name FROM sylius_product_association_type_translation WHERE sylius_product_association_type_translation.translatable_id = sylius_product_association_type.id AND sylius_product_association_type_translation.locale = "'.$defaultLocale.'")'); |
|
53 | + $this->addSql('UPDATE sylius_product_association_type SET name = (SELECT name FROM sylius_product_association_type_translation WHERE sylius_product_association_type_translation.translatable_id = sylius_product_association_type.id AND sylius_product_association_type_translation.locale = "' . $defaultLocale . '")'); |
|
54 | 54 | $this->addSql('DROP TABLE sylius_product_association_type_translation'); |
55 | 55 | } |
56 | 56 | } |
@@ -429,6 +429,8 @@ |
||
429 | 429 | } |
430 | 430 | |
431 | 431 | /** |
432 | + * @param integer $timeout |
|
433 | + * @param string $elementName |
|
432 | 434 | * @return bool |
433 | 435 | */ |
434 | 436 | private function waitForElement($timeout, $elementName) |
@@ -46,7 +46,8 @@ discard block |
||
46 | 46 | $this->getAllOrdersCount()->shouldReturn(0); |
47 | 47 | } |
48 | 48 | |
49 | - function it_has_number_of_all_orders(ChannelInterface $channel) { |
|
49 | + function it_has_number_of_all_orders(ChannelInterface $channel) |
|
50 | + { |
|
50 | 51 | $firstStatistics = new PerChannelCustomerStatistics(110, 120, $channel->getWrappedObject()); |
51 | 52 | $secondStatistics = new PerChannelCustomerStatistics(13, 120, $channel->getWrappedObject()); |
52 | 53 | |
@@ -55,7 +56,8 @@ discard block |
||
55 | 56 | $this->getAllOrdersCount()->shouldReturn(123); |
56 | 57 | } |
57 | 58 | |
58 | - function it_has_an_array_of_statistics_per_channel(ChannelInterface $channel) { |
|
59 | + function it_has_an_array_of_statistics_per_channel(ChannelInterface $channel) |
|
60 | + { |
|
59 | 61 | $firstStatistics = new PerChannelCustomerStatistics(110, 120, $channel->getWrappedObject()); |
60 | 62 | $secondStatistics = new PerChannelCustomerStatistics(13, 120, $channel->getWrappedObject()); |
61 | 63 |