Skip to content

Commit

Permalink
Merge branch '1.7'
Browse files Browse the repository at this point in the history
* 1.7:
  Remove inheritdoc directives
  Apply coding standard fixes
  Upgrade yarn.lock
  [Docs] fix sylius plus deployment
  Update github PR template
  Sylius 1.4 end of security support
  [Fix] Less strict symfony form conflict
  [Translations] Updated translations from Crowdin
  Changed descriptions and added italic font
  change lorem ipsum description and fix carousel header
  • Loading branch information
pamil committed Jun 24, 2020
2 parents 93b9621 + 7e90f81 commit 58b7b17
Show file tree
Hide file tree
Showing 102 changed files with 0 additions and 1,101 deletions.
3 changes: 0 additions & 3 deletions Calculator/ProductVariantPriceCalculator.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@

final class ProductVariantPriceCalculator implements ProductVariantPricesCalculatorInterface
{
/**
* {@inheritdoc}
*/
public function calculate(ProductVariantInterface $productVariant, array $context): int
{
Assert::keyExists($context, 'channel');
Expand Down
3 changes: 0 additions & 3 deletions Cart/Context/ShopBasedCartContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ public function __construct(CartContextInterface $cartContext, ShopperContextInt
$this->shopperContext = $shopperContext;
}

/**
* {@inheritdoc}
*/
public function getCart(): BaseOrderInterface
{
if (null !== $this->cart) {
Expand Down
3 changes: 0 additions & 3 deletions Cart/Modifier/LimitingOrderItemQuantityModifier.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ public function __construct(OrderItemQuantityModifierInterface $decoratedOrderIt
$this->limit = $limit;
}

/**
* {@inheritdoc}
*/
public function modify(OrderItemInterface $orderItem, int $targetQuantity): void
{
$targetQuantity = min($targetQuantity, $this->limit);
Expand Down
3 changes: 0 additions & 3 deletions Checker/OrderPaymentMethodSelectionRequirementChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ public function __construct(PaymentMethodsResolverInterface $paymentMethodsResol
$this->paymentMethodsResolver = $paymentMethodsResolver;
}

/**
* {@inheritdoc}
*/
public function isPaymentMethodSelectionRequired(OrderInterface $order): bool
{
if ($order->getTotal() <= 0) {
Expand Down
3 changes: 0 additions & 3 deletions Checker/OrderShippingMethodSelectionRequirementChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ public function __construct(ShippingMethodsResolverInterface $shippingMethodsRes
$this->shippingMethodsResolver = $shippingMethodsResolver;
}

/**
* {@inheritdoc}
*/
public function isShippingMethodSelectionRequired(OrderInterface $order): bool
{
if (!$order->isShippingRequired()) {
Expand Down
12 changes: 0 additions & 12 deletions Context/ShopperContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,33 +49,21 @@ public function __construct(
$this->customerContext = $customerContext;
}

/**
* {@inheritdoc}
*/
public function getChannel(): ChannelInterface
{
return $this->channelContext->getChannel();
}

/**
* {@inheritdoc}
*/
public function getCurrencyCode(): string
{
return $this->currencyContext->getCurrencyCode();
}

/**
* {@inheritdoc}
*/
public function getLocaleCode(): string
{
return $this->localeContext->getLocaleCode();
}

/**
* {@inheritdoc}
*/
public function getCustomer(): ?CustomerInterface
{
return $this->customerContext->getCustomer();
Expand Down
3 changes: 0 additions & 3 deletions Currency/Context/ChannelAwareCurrencyContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ public function __construct(CurrencyContextInterface $currencyContext, ChannelCo
$this->channelContext = $channelContext;
}

/**
* {@inheritdoc}
*/
public function getCurrencyCode(): string
{
/** @var ChannelInterface $channel */
Expand Down
3 changes: 0 additions & 3 deletions Currency/Context/StorageBasedCurrencyContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ public function __construct(ChannelContextInterface $channelContext, CurrencySto
$this->currencyStorage = $currencyStorage;
}

/**
* {@inheritdoc}
*/
public function getCurrencyCode(): string
{
/** @var ChannelInterface $channel */
Expand Down
9 changes: 0 additions & 9 deletions Currency/CurrencyStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ public function __construct(StorageInterface $storage)
$this->storage = $storage;
}

/**
* {@inheritdoc}
*/
public function set(ChannelInterface $channel, string $currencyCode): void
{
if ($this->isBaseCurrency($currencyCode, $channel) || !$this->isAvailableCurrency($currencyCode, $channel)) {
Expand All @@ -41,17 +38,11 @@ public function set(ChannelInterface $channel, string $currencyCode): void
$this->storage->set($this->provideKey($channel), $currencyCode);
}

/**
* {@inheritdoc}
*/
public function get(ChannelInterface $channel): ?string
{
return $this->storage->get($this->provideKey($channel));
}

/**
* {@inheritdoc}
*/
private function provideKey(ChannelInterface $channel): string
{
return '_currency_' . $channel->getCode();
Expand Down
3 changes: 0 additions & 3 deletions Customer/CustomerUniqueAddressAdder.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ public function __construct(AddressComparatorInterface $addressComparator)
$this->addressComparator = $addressComparator;
}

/**
* {@inheritdoc}
*/
public function add(CustomerInterface $customer, AddressInterface $address): void
{
foreach ($customer->getAddresses() as $customerAddress) {
Expand Down
3 changes: 0 additions & 3 deletions Customer/Statistics/CustomerStatisticsProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ public function __construct(OrderRepositoryInterface $orderRepository, Repositor
$this->channelRepository = $channelRepository;
}

/**
* {@inheritdoc}
*/
public function getCustomerStatistics(CustomerInterface $customer): CustomerStatistics
{
$orders = $this->orderRepository->findForCustomerStatistics($customer);
Expand Down
3 changes: 0 additions & 3 deletions Distributor/IntegerDistributor.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@

final class IntegerDistributor implements IntegerDistributorInterface
{
/**
* {@inheritdoc}
*/
public function distribute(float $amount, int $numberOfTargets): array
{
Assert::true((1 <= $numberOfTargets), 'Number of targets must be bigger than 0.');
Expand Down
3 changes: 0 additions & 3 deletions Distributor/ProportionalIntegerDistributor.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@

final class ProportionalIntegerDistributor implements ProportionalIntegerDistributorInterface
{
/**
* {@inheritdoc}
*/
public function distribute(array $integers, int $amount): array
{
Assert::allInteger($integers);
Expand Down
3 changes: 0 additions & 3 deletions Exception/MissingChannelConfigurationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@

final class MissingChannelConfigurationException extends \RuntimeException
{
/**
* {@inheritdoc}
*/
public function __construct(string $message, ?\Exception $previousException = null)
{
parent::__construct($message, 0, $previousException);
Expand Down
6 changes: 0 additions & 6 deletions Factory/AddressFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,11 @@ public function __construct(FactoryInterface $decoratedFactory)
$this->decoratedFactory = $decoratedFactory;
}

/**
* {@inheritdoc}
*/
public function createNew(): AddressInterface
{
return $this->decoratedFactory->createNew();
}

/**
* {@inheritdoc}
*/
public function createForCustomer(CustomerInterface $customer): AddressInterface
{
/** @var AddressInterface $address */
Expand Down
9 changes: 0 additions & 9 deletions Factory/CartItemFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,11 @@ public function __construct(FactoryInterface $decoratedFactory, ProductVariantRe
$this->variantResolver = $variantResolver;
}

/**
* {@inheritdoc}
*/
public function createNew(): OrderItemInterface
{
return $this->decoratedFactory->createNew();
}

/**
* {@inheritdoc}
*/
public function createForProduct(ProductInterface $product): OrderItemInterface
{
/** @var OrderItemInterface $cartItem */
Expand All @@ -53,9 +47,6 @@ public function createForProduct(ProductInterface $product): OrderItemInterface
return $cartItem;
}

/**
* {@inheritdoc}
*/
public function createForCart(OrderInterface $order): OrderItemInterface
{
/** @var OrderItemInterface $cartItem */
Expand Down
6 changes: 0 additions & 6 deletions Factory/PaymentMethodFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,11 @@ public function __construct(FactoryInterface $decoratedFactory, FactoryInterface
$this->gatewayConfigFactory = $gatewayConfigFactory;
}

/**
* {@inheritdoc}
*/
public function createNew(): PaymentMethodInterface
{
return $this->decoratedFactory->createNew();
}

/**
* {@inheritdoc}
*/
public function createWithGateway(string $gatewayFactory): PaymentMethodInterface
{
/** @var GatewayConfigInterface $gatewayConfig */
Expand Down
18 changes: 0 additions & 18 deletions Factory/PromotionActionFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,11 @@ public function __construct(FactoryInterface $decoratedFactory)
$this->decoratedFactory = $decoratedFactory;
}

/**
* {@inheritdoc}
*/
public function createNew(): PromotionActionInterface
{
return $this->decoratedFactory->createNew();
}

/**
* {@inheritdoc}
*/
public function createFixedDiscount(int $amount, string $channelCode): PromotionActionInterface
{
return $this->createAction(
Expand All @@ -50,9 +44,6 @@ public function createFixedDiscount(int $amount, string $channelCode): Promotion
);
}

/**
* {@inheritdoc}
*/
public function createUnitFixedDiscount(int $amount, string $channelCode): PromotionActionInterface
{
return $this->createAction(
Expand All @@ -61,9 +52,6 @@ public function createUnitFixedDiscount(int $amount, string $channelCode): Promo
);
}

/**
* {@inheritdoc}
*/
public function createPercentageDiscount(float $percentage): PromotionActionInterface
{
return $this->createAction(
Expand All @@ -72,9 +60,6 @@ public function createPercentageDiscount(float $percentage): PromotionActionInte
);
}

/**
* {@inheritdoc}
*/
public function createUnitPercentageDiscount(float $percentage, string $channelCode): PromotionActionInterface
{
return $this->createAction(
Expand All @@ -83,9 +68,6 @@ public function createUnitPercentageDiscount(float $percentage, string $channelC
);
}

/**
* {@inheritdoc}
*/
public function createShippingPercentageDiscount(float $percentage): PromotionActionInterface
{
return $this->createAction(
Expand Down
21 changes: 0 additions & 21 deletions Factory/PromotionRuleFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,41 +32,26 @@ public function __construct(FactoryInterface $decoratedFactory)
$this->decoratedFactory = $decoratedFactory;
}

/**
* {@inheritdoc}
*/
public function createNew(): PromotionRuleInterface
{
return $this->decoratedFactory->createNew();
}

/**
* {@inheritdoc}
*/
public function createCartQuantity(int $count): PromotionRuleInterface
{
return $this->createPromotionRule(CartQuantityRuleChecker::TYPE, ['count' => $count]);
}

/**
* {@inheritdoc}
*/
public function createItemTotal(string $channelCode, int $amount): PromotionRuleInterface
{
return $this->createPromotionRule(ItemTotalRuleChecker::TYPE, [$channelCode => ['amount' => $amount]]);
}

/**
* {@inheritdoc}
*/
public function createHasTaxon(array $taxons): PromotionRuleInterface
{
return $this->createPromotionRule(HasTaxonRuleChecker::TYPE, ['taxons' => $taxons]);
}

/**
* {@inheritdoc}
*/
public function createItemsFromTaxonTotal(string $channelCode, string $taxonCode, int $amount): PromotionRuleInterface
{
return $this->createPromotionRule(
Expand All @@ -75,17 +60,11 @@ public function createItemsFromTaxonTotal(string $channelCode, string $taxonCode
;
}

/**
* {@inheritdoc}
*/
public function createNthOrder(int $nth): PromotionRuleInterface
{
return $this->createPromotionRule(NthOrderRuleChecker::TYPE, ['nth' => $nth]);
}

/**
* {@inheritdoc}
*/
public function createContainsProduct(string $productCode): PromotionRuleInterface
{
return $this->createPromotionRule(ContainsProductRuleChecker::TYPE, ['product_code' => $productCode]);
Expand Down
9 changes: 0 additions & 9 deletions Inventory/Operator/OrderInventoryOperator.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@

final class OrderInventoryOperator implements OrderInventoryOperatorInterface
{
/**
* {@inheritdoc}
*/
public function cancel(OrderInterface $order): void
{
if (in_array(
Expand All @@ -38,9 +35,6 @@ public function cancel(OrderInterface $order): void
$this->release($order);
}

/**
* {@inheritdoc}
*/
public function hold(OrderInterface $order): void
{
/** @var OrderItemInterface $orderItem */
Expand All @@ -55,9 +49,6 @@ public function hold(OrderInterface $order): void
}
}

/**
* {@inheritdoc}
*/
public function sell(OrderInterface $order): void
{
/** @var OrderItemInterface $orderItem */
Expand Down
Loading

0 comments on commit 58b7b17

Please sign in to comment.