@@ -84,6 +84,7 @@ |
||
84 | 84 | |
85 | 85 | /** |
86 | 86 | * @param Collaborator[] ...$collaborators |
87 | + * @param FixtureInterface $collaborators |
|
87 | 88 | * |
88 | 89 | * @return \Generator |
89 | 90 | */ |
@@ -13,7 +13,6 @@ |
||
13 | 13 | |
14 | 14 | use PhpSpec\ObjectBehavior; |
15 | 15 | use PhpSpec\Wrapper\Collaborator; |
16 | -use Prophecy\Argument; |
|
17 | 16 | use Sylius\Bundle\FixturesBundle\Fixture\FixtureInterface; |
18 | 17 | use Sylius\Bundle\FixturesBundle\Suite\Suite; |
19 | 18 | use Sylius\Bundle\FixturesBundle\Suite\SuiteInterface; |
@@ -222,7 +222,8 @@ |
||
222 | 222 | * |
223 | 223 | * @return \Generator |
224 | 224 | */ |
225 | - private function createGenerator(Collaborator ...$collaborators) { |
|
225 | + private function createGenerator(Collaborator ...$collaborators) |
|
226 | + { |
|
226 | 227 | foreach ($collaborators as $collaborator) { |
227 | 228 | yield $collaborator->getWrappedObject() => []; |
228 | 229 | } |
@@ -222,7 +222,8 @@ |
||
222 | 222 | * |
223 | 223 | * @return \Generator |
224 | 224 | */ |
225 | - private function createGenerator(Collaborator ...$collaborators) { |
|
225 | + private function createGenerator(Collaborator ...$collaborators) |
|
226 | + { |
|
226 | 227 | foreach ($collaborators as $collaborator) { |
227 | 228 | yield $collaborator->getWrappedObject() => []; |
228 | 229 | } |
@@ -13,7 +13,6 @@ |
||
13 | 13 | |
14 | 14 | use PhpSpec\ObjectBehavior; |
15 | 15 | use PhpSpec\Wrapper\Collaborator; |
16 | -use Prophecy\Argument; |
|
17 | 16 | use Sylius\Bundle\FixturesBundle\Fixture\FixtureInterface; |
18 | 17 | use Sylius\Bundle\FixturesBundle\Fixture\FixtureRegistryInterface; |
19 | 18 | use Sylius\Bundle\FixturesBundle\Listener\ListenerInterface; |
@@ -31,10 +31,19 @@ |
||
31 | 31 | */ |
32 | 32 | public function isAvailableInChannel($channelName); |
33 | 33 | |
34 | + /** |
|
35 | + * @return void |
|
36 | + */ |
|
34 | 37 | public function enable(); |
35 | 38 | |
39 | + /** |
|
40 | + * @return void |
|
41 | + */ |
|
36 | 42 | public function disable(); |
37 | 43 | |
44 | + /** |
|
45 | + * @return void |
|
46 | + */ |
|
38 | 47 | public function removeZone(); |
39 | 48 | |
40 | 49 | /** |
@@ -20,6 +20,7 @@ discard block |
||
20 | 20 | { |
21 | 21 | /** |
22 | 22 | * @param string $shippingMethod |
23 | + * @return void |
|
23 | 24 | */ |
24 | 25 | public function selectShippingMethod($shippingMethod); |
25 | 26 | |
@@ -48,14 +49,23 @@ discard block |
||
48 | 49 | */ |
49 | 50 | public function getItemSubtotal($itemName); |
50 | 51 | |
52 | + /** |
|
53 | + * @return void |
|
54 | + */ |
|
51 | 55 | public function nextStep(); |
52 | 56 | |
57 | + /** |
|
58 | + * @return void |
|
59 | + */ |
|
53 | 60 | public function changeAddress(); |
54 | 61 | |
62 | + /** |
|
63 | + * @return void |
|
64 | + */ |
|
55 | 65 | public function changeAddressByStepLabel(); |
56 | 66 | |
57 | 67 | /** |
58 | - * @return mixed string |
|
68 | + * @return string string |
|
59 | 69 | */ |
60 | 70 | public function getPurchaserEmail(); |
61 | 71 |
@@ -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 | { |
@@ -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 | } |