Completed
Push — locale-in-url ( 6d9eda )
by Kamil
23:08
created
src/Sylius/Component/Core/Payment/Provider/OrderPaymentProvider.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
src/Sylius/Component/Grid/Data/ExpressionBuilderInterface.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
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
      */
Please login to merge, or discard this patch.
app/migrations/Version20161214153137.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
src/Sylius/Behat/Page/Admin/Channel/CreatePageInterface.php 1 patch
Doc Comments   +18 added lines patch added patch discarded remove patch
@@ -18,67 +18,85 @@
 block discarded – undo
18 18
  */
19 19
 interface CreatePageInterface extends BaseCreatePageInterface
20 20
 {
21
+    /**
22
+     * @return void
23
+     */
21 24
     public function enable();
22 25
 
26
+    /**
27
+     * @return void
28
+     */
23 29
     public function disable();
24 30
 
25 31
     /**
26 32
      * @param string $name
33
+     * @return void
27 34
      */
28 35
     public function nameIt($name);
29 36
 
30 37
     /**
31 38
      * @param string $code
39
+     * @return void
32 40
      */
33 41
     public function specifyCode($code);
34 42
 
35 43
     /**
36 44
      * @param string $description
45
+     * @return void
37 46
      */
38 47
     public function describeItAs($description);
39 48
 
40 49
     /**
41 50
      * @param string $hostname
51
+     * @return void
42 52
      */
43 53
     public function setHostname($hostname);
44 54
 
45 55
     /**
46 56
      * @param string $contactEmail
57
+     * @return void
47 58
      */
48 59
     public function setContactEmail($contactEmail);
49 60
 
50 61
     /**
51 62
      * @param string $color
63
+     * @return void
52 64
      */
53 65
     public function defineColor($color);
54 66
 
55 67
     /**
56 68
      * @param string $language
69
+     * @return void
57 70
      */
58 71
     public function chooseLocale($language);
59 72
 
60 73
     /**
61 74
      * @param string $currencyCode
75
+     * @return void
62 76
      */
63 77
     public function chooseCurrency($currencyCode);
64 78
 
65 79
     /**
66 80
      * @param string $taxZone
81
+     * @return void
67 82
      */
68 83
     public function chooseDefaultTaxZone($taxZone);
69 84
 
70 85
     /**
71 86
      * @param string $locale
87
+     * @return void
72 88
      */
73 89
     public function chooseDefaultLocale($locale);
74 90
 
75 91
     /**
76 92
      * @param string $currency
93
+     * @return void
77 94
      */
78 95
     public function chooseBaseCurrency($currency);
79 96
 
80 97
     /**
81 98
      * @param string $taxCalculationStrategy
99
+     * @return void
82 100
      */
83 101
     public function chooseTaxCalculationStrategy($taxCalculationStrategy);
84 102
 }
Please login to merge, or discard this patch.
Component/Core/Resolver/ZoneAndChannelBasedShippingMethodsResolver.php 1 patch
Unused Use Statements   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,12 +12,12 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Core/spec/Resolver/ZoneAndChannelBasedShippingMethodsResolverSpec.php 1 patch
Unused Use Statements   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,16 +14,16 @@
 block discarded – undo
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
 /**
Please login to merge, or discard this patch.
app/migrations/Version20161219160441.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
src/Sylius/Behat/Page/Shop/Checkout/AddressPage.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -429,6 +429,8 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php 2 patches
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@
 block discarded – undo
16 16
 use Sylius\Behat\NotificationType;
17 17
 use Sylius\Behat\Page\Admin\Crud\CreatePageInterface;
18 18
 use Sylius\Behat\Page\Admin\Crud\UpdatePageInterface;
19
+use Sylius\Behat\Page\Admin\ProductReview\IndexPageInterface as ProductReviewIndexPageInterface;
19 20
 use Sylius\Behat\Page\Admin\Product\CreateConfigurableProductPageInterface;
20 21
 use Sylius\Behat\Page\Admin\Product\CreateSimpleProductPageInterface;
21 22
 use Sylius\Behat\Page\Admin\Product\IndexPageInterface;
22 23
 use Sylius\Behat\Page\Admin\Product\IndexPerTaxonPageInterface;
23 24
 use Sylius\Behat\Page\Admin\Product\UpdateConfigurableProductPageInterface;
24 25
 use Sylius\Behat\Page\Admin\Product\UpdateSimpleProductPageInterface;
25
-use Sylius\Behat\Page\Admin\ProductReview\IndexPageInterface as ProductReviewIndexPageInterface;
26 26
 use Sylius\Behat\Page\SymfonyPageInterface;
27 27
 use Sylius\Behat\Service\NotificationCheckerInterface;
28 28
 use Sylius\Behat\Service\Resolver\CurrentPageResolverInterface;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -248,6 +248,7 @@
 block discarded – undo
248 248
      * @Then the product :productName should appear in the store
249 249
      * @Then the product :productName should be in the shop
250 250
      * @Then this product should still be named :productName
251
+     * @param string $productName
251 252
      */
252 253
     public function theProductShouldAppearInTheShop($productName)
253 254
     {
Please login to merge, or discard this patch.