admin/Sylius
1
0
Fork 0
mirror of https://github.com/jbcr/Sylius.git synced 2026-03-24 00:42:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.13' into 2.0

Browse Source 
* 1.13:
  [ECS] Fix nullable type declarations in the codebase
  [ECS] Fix nullable type declarations in Behat namespace
  [ECS] Add the NullableTypeDeclarationForDefaultNullValueFixer rule
  Add default label template in ShopBundle extending the UiBundle one
  Use extends instead of include in ShopBundle flashes template
  Manage confirmation modal for ShopBundle extending UiBundle
  Use Shop pagination macro in templates
  Use Shop messages macro in templates
  Use Shop flags macro in templates
  Use Shop headers macro in templates
  Use Shop buttons macro in templates
  Add upmerging from 2.0 to api-platform-3
This commit is contained in:
Grzegorz Sadowski
2024-04-16 12:45:01 +02:00
parent 756c01ed96 575116e26b
commit ee9a386574
158 changed files with 230 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/upmerge_pr.yaml vendored
View File

@@ -29,6 +29,9 @@ jobs:
-
base_branch: "2.0"
target_branch: "bootstrap-admin-panel"
-
base_branch: "2.0"
target_branch: "api-platform-3"
steps:
-

2
ecs.php
View File

@@ -14,6 +14,7 @@ declare(strict_types=1);
use PhpCsFixer\Fixer\ClassNotation\OrderedTypesFixer;
use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
use PhpCsFixer\Fixer\Comment\HeaderCommentFixer;
use PhpCsFixer\Fixer\FunctionNotation\NullableTypeDeclarationForDefaultNullValueFixer;
use PhpCsFixer\Fixer\LanguageConstruct\ErrorSuppressionFixer;
use PhpCsFixer\Fixer\Phpdoc\PhpdocSeparationFixer;
use SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff;
@@ -32,6 +33,7 @@ return static function (ECSConfig $config): void {
]);
$config->ruleWithConfiguration(PhpdocSeparationFixer::class, ['groups' => [['Given', 'When', 'Then']]]);
$config->ruleWithConfiguration(OrderedTypesFixer::class, ['null_adjustment' => 'always_last']);
$config->ruleWithConfiguration(NullableTypeDeclarationForDefaultNullValueFixer::class, ['use_nullable_type_declaration' => true]);
$config->ruleWithConfiguration(
HeaderCommentFixer::class,
[

6
src/Sylius/Behat/Context/Api/Admin/ManagingAdministratorsContext.php
View File

@@ -72,7 +72,7 @@ final class ManagingAdministratorsContext implements Context
* @When I do not specify its email
* @When I change its email to :email
*/
public function iSpecifyItsEmailAs(string $email = null): void
public function iSpecifyItsEmailAs(?string $email = null): void
{
if ($email !== null) {
$this->client->addRequestData('email', $email);
@@ -84,7 +84,7 @@ final class ManagingAdministratorsContext implements Context
* @When I do not specify its name
* @When I change its name to :username
*/
public function iSpecifyItsNameAs(string $username = null): void
public function iSpecifyItsNameAs(?string $username = null): void
{
if ($username !== null) {
$this->client->addRequestData('username', $username);
@@ -104,7 +104,7 @@ final class ManagingAdministratorsContext implements Context
* @When I do not specify its password
* @When I change its password to :password
*/
public function iSpecifyItsPasswordAs(string $password = null): void
public function iSpecifyItsPasswordAs(?string $password = null): void
{
if ($password !== null) {
$this->client->addRequestData('plainPassword', $password);

2
src/Sylius/Behat/Context/Api/Admin/ManagingPaymentMethodsContext.php
View File

@@ -146,7 +146,7 @@ final class ManagingPaymentMethodsContext implements Context
* @When I specify its code as :code
* @When I do not specify its code
*/
public function iSpecifyItsCodeAs(string $code = null): void
public function iSpecifyItsCodeAs(?string $code = null): void
{
$this->client->addRequestData('code', $code);
}

2
src/Sylius/Behat/Context/Api/Admin/ManagingProductAssociationTypesContext.php
View File

@@ -50,7 +50,7 @@ final class ManagingProductAssociationTypesContext implements Context
* @When I name it :productAssociationTypeName in :localeCode
* @When I do not name it
*/
public function iNameItIn(string $productAssociationTypeName = null, string $localeCode = 'en_US'): void
public function iNameItIn(?string $productAssociationTypeName = null, string $localeCode = 'en_US'): void
{
$this->client->updateRequestData([
'translations' => [

2
src/Sylius/Behat/Context/Api/Admin/ManagingProductsContext.php
View File

@@ -106,7 +106,7 @@ final class ManagingProductsContext implements Context
* @When I specify its code as :code
* @When I do not specify its code
*/
public function iSpecifyItsCodeAs(string $code = null): void
public function iSpecifyItsCodeAs(?string $code = null): void
{
$this->client->addRequestData('code', $code);
}

2
src/Sylius/Behat/Context/Api/Admin/ManagingShipmentsContext.php
View File

@@ -223,7 +223,7 @@ final class ManagingShipmentsContext implements Context
string $orderNumber,
string $shippingState,
CustomerInterface $customer,
ChannelInterface $channel = null,
?ChannelInterface $channel = null,
): void {
$this->client->index(Resources::SHIPMENTS);

2
src/Sylius/Behat/Context/Api/Admin/ManagingShippingMethodsContext.php
View File

@@ -286,7 +286,7 @@ final class ManagingShippingMethodsContext implements Context
* @When /^I define it for the (zone named "[^"]+")$/
* @When I do not specify its zone
*/
public function iDefineItForTheZone(ZoneInterface $zone = null): void
public function iDefineItForTheZone(?ZoneInterface $zone = null): void
{
if (null !== $zone) {
$this->client->addRequestData('zone', $this->iriConverter->getIriFromResource($zone));

2
src/Sylius/Behat/Context/Api/Shop/PromotionContext.php
View File

@@ -33,7 +33,7 @@ final class PromotionContext implements Context
* @When I use coupon with code :couponCode
* @When I remove coupon from my cart
*/
public function iUseCouponWithCode(string $couponCode = null): void
public function iUseCouponWithCode(?string $couponCode = null): void
{
$this->useCouponCode($couponCode);
}

2
src/Sylius/Behat/Context/Setup/CatalogPromotionContext.php
View File

@@ -855,7 +855,7 @@ final class CatalogPromotionContext implements Context
array $channels = [],
array $scopes = [],
array $actions = [],
int $priority = null,
?int $priority = null,
bool $exclusive = false,
?string $startDate = null,
?string $endDate = null,

8
src/Sylius/Behat/Context/Setup/ChannelContext.php
View File

@@ -122,10 +122,10 @@ final class ChannelContext implements Context
* @Given the store operates on a channel identified by :channelCode code
*/
public function theStoreOperatesOnAChannelNamed(
string $channelName = null,
string $currencyCode = null,
string $hostname = null,
string $channelCode = null,
?string $channelName = null,
?string $currencyCode = null,
?string $hostname = null,
?string $channelCode = null,
): void {
$channelCode = $channelCode ?? StringInflector::nameToLowercaseCode($channelName);
$channelName = $channelName ?? $channelCode;

4
src/Sylius/Behat/Context/Setup/CheckoutContext.php
View File

@@ -125,8 +125,8 @@ final class CheckoutContext implements Context
private function completeCheckout(
OrderInterface $order,
ShippingMethodInterface $shippingMethod = null,
PaymentMethodInterface $paymentMethod = null,
?ShippingMethodInterface $shippingMethod = null,
?PaymentMethodInterface $paymentMethod = null,
): void {
$shippingMethod = $shippingMethod ?: $this->shippingMethodRepository->findOneBy([]);

2
src/Sylius/Behat/Context/Setup/CustomerContext.php
View File

@@ -180,7 +180,7 @@ final class CustomerContext implements Context
$email,
$firstName = null,
$lastName = null,
\DateTimeInterface $createdAt = null,
?\DateTimeInterface $createdAt = null,
$phoneNumber = null,
) {
/** @var CustomerInterface $customer */

10
src/Sylius/Behat/Context/Setup/ProductContext.php
View File

@@ -79,7 +79,7 @@ final class ProductContext implements Context
* @Given /^the store(?:| also) has a product "([^"]+)" priced at ("[^"]+")$/
* @Given /^the store(?:| also) has a product "([^"]+)" priced at ("[^"]+") in ("[^"]+" channel)$/
*/
public function storeHasAProductPricedAt($productName, int $price = 100, ChannelInterface $channel = null): void
public function storeHasAProductPricedAt($productName, int $price = 100, ?ChannelInterface $channel = null): void
{
$product = $this->createProduct($productName, $price, $channel);
@@ -330,7 +330,7 @@ final class ProductContext implements Context
ProductInterface $product,
$productVariantName,
$price,
ChannelInterface $channel = null,
?ChannelInterface $channel = null,
) {
$this->createProductVariant(
$product,
@@ -1368,7 +1368,7 @@ final class ProductContext implements Context
return (int) round((float) str_replace(['€', '£', '$'], '', $price) * 100, 2);
}
private function createProduct(string $productName, int $price = 100, ChannelInterface $channel = null): ProductInterface
private function createProduct(string $productName, int $price = 100, ?ChannelInterface $channel = null): ProductInterface
{
if (null === $channel && $this->sharedStorage->has('channel')) {
$channel = $this->sharedStorage->get('channel');
@@ -1458,7 +1458,7 @@ final class ProductContext implements Context
$productVariantName,
$price,
$code,
ChannelInterface $channel = null,
?ChannelInterface $channel = null,
$position = null,
$shippingRequired = true,
int $currentStock = 0,
@@ -1549,7 +1549,7 @@ final class ProductContext implements Context
$productVariant->addTranslation($translation);
}
private function createChannelPricingForChannel(int $price, ChannelInterface $channel = null): ChannelPricingInterface
private function createChannelPricingForChannel(int $price, ?ChannelInterface $channel = null): ChannelPricingInterface
{
/** @var ChannelPricingInterface $channelPricing */
$channelPricing = $this->channelPricingFactory->createNew();

2
src/Sylius/Behat/Context/Setup/ProductReviewContext.php
View File

@@ -136,7 +136,7 @@ final class ProductReviewContext implements Context
$title,
$rating,
$comment,
CustomerInterface $customer = null,
?CustomerInterface $customer = null,
$transition = ProductReviewTransitions::TRANSITION_ACCEPT,
) {
/** @var ReviewInterface $review */

16
src/Sylius/Behat/Context/Setup/PromotionContext.php
View File

@@ -1039,8 +1039,8 @@ final class PromotionContext implements Context
?array $rules = null,
?array $actions = null,
array $coupons = [],
int $priority = null,
int $usageLimit = null,
?int $priority = null,
?int $usageLimit = null,
bool $couponBased = false,
bool $exclusive = false,
bool $appliesToDiscounted = true,
@@ -1081,7 +1081,7 @@ final class PromotionContext implements Context
PromotionInterface $promotion,
int $discount,
array $configuration = [],
PromotionRuleInterface $rule = null,
?PromotionRuleInterface $rule = null,
): void {
$channelCode = $this->getChannelCode();
@@ -1097,7 +1097,7 @@ final class PromotionContext implements Context
PromotionInterface $promotion,
float $discount,
array $configuration = [],
PromotionRuleInterface $rule = null,
?PromotionRuleInterface $rule = null,
): void {
$channelCode = $this->getChannelCode();
@@ -1113,8 +1113,8 @@ final class PromotionContext implements Context
PromotionInterface $promotion,
int $discount,
array $configuration = [],
PromotionRuleInterface $rule = null,
ChannelInterface $channel = null,
?PromotionRuleInterface $rule = null,
?ChannelInterface $channel = null,
): void {
$channelCode = (null !== $channel) ? $channel->getCode() : $this->sharedStorage->get('channel')->getCode();
@@ -1125,7 +1125,7 @@ final class PromotionContext implements Context
PromotionInterface $promotion,
float $discount,
array $configuration = [],
PromotionRuleInterface $rule = null,
?PromotionRuleInterface $rule = null,
): void {
$this->persistPromotion($promotion, $this->actionFactory->createPercentageDiscount($discount), $configuration, $rule);
}
@@ -1134,7 +1134,7 @@ final class PromotionContext implements Context
PromotionInterface $promotion,
PromotionActionInterface $action,
array $configuration,
PromotionRuleInterface $rule = null,
?PromotionRuleInterface $rule = null,
): void {
$configuration = array_merge_recursive($action->getConfiguration(), $configuration);
$action->setConfiguration($configuration);

4
src/Sylius/Behat/Context/Setup/ShippingContext.php
View File

@@ -294,8 +294,8 @@ final class ShippingContext implements Context
string $shippingMethodName,
int $firstFee,
ChannelInterface $firstChannel,
int $secondFee = null,
ChannelInterface $secondChannel = null,
?int $secondFee = null,
?ChannelInterface $secondChannel = null,
): void {
$configuration = [];
$channels = [];

2
src/Sylius/Behat/Context/Setup/ZoneContext.php
View File

@@ -85,7 +85,7 @@ final class ZoneContext implements Context
* @Given the store has a zone :zoneName with code :code
* @Given the store also has a zone :zoneName with code :code
*/
public function theStoreHasAZoneWithCode(string $zoneName, string $code = null): void
public function theStoreHasAZoneWithCode(string $zoneName, ?string $code = null): void
{
$this->saveZone($this->createZone($zoneName, $code, Scope::ALL), 'zone');
}

2
src/Sylius/Behat/Context/Ui/Admin/LocaleContext.php
View File

@@ -56,7 +56,7 @@ final class LocaleContext implements Context
Assert::true($this->dashboardPage->isSectionWithLabelVisible($this->translate('sylius.menu.admin.main.catalog.header', $localeCode)));
}
private function translate(string $text, string $localeCode, string $domain = null): string
private function translate(string $text, string $localeCode, ?string $domain = null): string
{
return $this->translator->trans($text, [], $domain, $localeCode);
}

4
src/Sylius/Behat/Context/Ui/Admin/ManagingChannelsContext.php
View File

@@ -72,7 +72,7 @@ final class ManagingChannelsContext implements Context
* @When I do not name it
* @When I remove its name
*/
public function iNameIt(string $name = null): void
public function iNameIt(?string $name = null): void
{
$this->createPage->nameIt($name ?? '');
}
@@ -98,7 +98,7 @@ final class ManagingChannelsContext implements Context
* @When I choose :defaultLocaleName as a default locale
* @When I do not choose default locale
*/
public function iChooseAsADefaultLocale(string $defaultLocaleName = null): void
public function iChooseAsADefaultLocale(?string $defaultLocaleName = null): void
{
$this->createPage->chooseDefaultLocale($defaultLocaleName);
}

2
src/Sylius/Behat/Context/Ui/Admin/ManagingShipmentsContext.php
View File

@@ -50,7 +50,7 @@ final class ManagingShipmentsContext implements Context
string $orderNumber,
string $shippingState,
CustomerInterface $customer,
Channel $channel = null,
?Channel $channel = null,
): void {
$parameters = [
'number' => $orderNumber,

2
src/Sylius/Behat/Context/Ui/Admin/ManagingShippingMethodsContext.php
View File

@@ -58,7 +58,7 @@ final class ManagingShippingMethodsContext implements Context
/**
* @When I specify its position as :position
*/
public function iSpecifyItsPositionAs(int $position = null)
public function iSpecifyItsPositionAs(?int $position = null)
{
$this->createPage->specifyPosition($position);
}

2
src/Sylius/Behat/Context/Ui/Admin/ManagingTaxonsContext.php
View File

@@ -306,7 +306,7 @@ final class ManagingTaxonsContext implements Context
* @When I attach the :path image
* @When I attach the :path image to this taxon
*/
public function iAttachImageWithType(string $path, string $type = null): void
public function iAttachImageWithType(string $path, ?string $type = null): void
{
$currentPage = $this->resolveCurrentPage();

6
src/Sylius/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php
View File

@@ -204,7 +204,7 @@ final class CheckoutAddressingContext implements Context
* @When /^I specified the billing (address as "[^"]+", "[^"]+", "[^"]+", "[^"]+" for "[^"]+")$/
* @When /^I define the billing (address as "[^"]+", "[^"]+", "[^"]+", "[^"]+" for "[^"]+")$/
*/
public function iSpecifiedTheBillingAddress(AddressInterface $address = null)
public function iSpecifiedTheBillingAddress(?AddressInterface $address = null)
{
if (null === $address) {
$address = $this->createDefaultAddress();
@@ -257,7 +257,7 @@ final class CheckoutAddressingContext implements Context
* @When /^I proceed selecting ("[^"]+" as billing country)$/
*/
public function iProceedSelectingBillingCountry(
CountryInterface $shippingCountry = null,
?CountryInterface $shippingCountry = null,
string $localeCode = 'en_US',
?string $email = null,
) {
@@ -278,7 +278,7 @@ final class CheckoutAddressingContext implements Context
*/
public function iProceedLoggingAsGuestWithAsBillingCountry(
string $email,
CountryInterface $shippingCountry = null,
?CountryInterface $shippingCountry = null,
): void {
$this->addressPage->open();
$this->addressPage->specifyEmail($email);

2
src/Sylius/Behat/Context/Ui/Shop/CheckoutContext.php
View File

@@ -118,7 +118,7 @@ final class CheckoutContext implements Context
* @When /^I proceed selecting ("[^"]+" as billing country) with "([^"]+)" method$/
*/
public function iProceedSelectingBillingCountryAndShippingMethod(
CountryInterface $shippingCountry = null,
?CountryInterface $shippingCountry = null,
?string $shippingMethodName = null,
): void {
$this->addressingContext->iProceedSelectingBillingCountry($shippingCountry);

2
src/Sylius/Behat/Exception/NotificationExpectationMismatchException.php
View File

@@ -21,7 +21,7 @@ final class NotificationExpectationMismatchException extends \RuntimeException
NotificationType $expectedType,
$expectedMessage,
$code = 0,
\Exception $previous = null,
?\Exception $previous = null,
) {
$message = sprintf(
'Expected *%s* notification with a "%s" message was not found',

2
src/Sylius/Behat/Page/Admin/Country/CreatePage.php
View File

@@ -22,7 +22,7 @@ class CreatePage extends BaseCreatePage implements CreatePageInterface
{
use ChoosesName;
public function addProvince(string $name, string $code, string $abbreviation = null): void
public function addProvince(string $name, string $code, ?string $abbreviation = null): void
{
$this->getDocument()->clickLink('Add province');

2
src/Sylius/Behat/Page/Admin/Country/CreatePageInterface.php
View File

@@ -19,5 +19,5 @@ interface CreatePageInterface extends BaseCreatePageInterface
{
public function chooseName(string $name): void;
public function addProvince(string $name, string $code, string $abbreviation = null): void;
public function addProvince(string $name, string $code, ?string $abbreviation = null): void;
}

2
src/Sylius/Behat/Page/Admin/Country/UpdatePage.php
View File

@@ -62,7 +62,7 @@ class UpdatePage extends BaseUpdatePage implements UpdatePageInterface
}
}
public function addProvince(string $name, string $code, string $abbreviation = null): void
public function addProvince(string $name, string $code, ?string $abbreviation = null): void
{
$this->clickAddProvinceButton();

2
src/Sylius/Behat/Page/Admin/Country/UpdatePageInterface.php
View File

@@ -27,7 +27,7 @@ interface UpdatePageInterface extends BaseUpdatePageInterface
public function isThereProvinceWithCode(string $provinceCode): bool;
public function addProvince(string $name, string $code, string $abbreviation = null): void;
public function addProvince(string $name, string $code, ?string $abbreviation = null): void;
public function removeProvince(string $provinceName): void;

2
src/Sylius/Behat/Page/Admin/Product/CreateSimpleProductPage.php
View File

@@ -152,7 +152,7 @@ class CreateSimpleProductPage extends BaseCreatePage implements CreateSimpleProd
$productTaxonsElement->setValue(implode(',', $productTaxonsCodes));
}
public function attachImage(string $path, string $type = null): void
public function attachImage(string $path, ?string $type = null): void
{
$this->clickTabIfItsNotActive('media');

2
src/Sylius/Behat/Page/Admin/Product/UpdateConfigurableProductPage.php
View File

@@ -112,7 +112,7 @@ class UpdateConfigurableProductPage extends BaseUpdatePage implements UpdateConf
return $productVariant->getCode() === $imageForm->find('css', 'input[type="hidden"]')->getValue();
}
public function attachImage(string $path, string $type = null, ?ProductVariantInterface $productVariant = null): void
public function attachImage(string $path, ?string $type = null, ?ProductVariantInterface $productVariant = null): void
{
$this->clickTabIfItsNotActive('media');
$this->getDocument()->clickLink('Add');

2
src/Sylius/Behat/Page/Admin/Product/UpdateConfigurableProductPageInterface.php
View File

@@ -41,7 +41,7 @@ interface UpdateConfigurableProductPageInterface extends UpdatePageInterface
public function hasLastImageAVariant(ProductVariantInterface $productVariant): bool;
public function attachImage(string $path, string $type = null, ?ProductVariantInterface $productVariant = null): void;
public function attachImage(string $path, ?string $type = null, ?ProductVariantInterface $productVariant = null): void;
public function changeImageWithType(string $type, string $path): void;

2
src/Sylius/Behat/Page/Admin/Product/UpdateSimpleProductPage.php
View File

@@ -230,7 +230,7 @@ class UpdateSimpleProductPage extends BaseUpdatePage implements UpdateSimpleProd
return in_array($statusCode, [200, 304], true);
}
public function attachImage(string $path, string $type = null): void
public function attachImage(string $path, ?string $type = null): void
{
$this->clickTabIfItsNotActive('media');

2
src/Sylius/Behat/Page/Admin/Product/UpdateSimpleProductPageInterface.php
View File

@@ -71,7 +71,7 @@ interface UpdateSimpleProductPageInterface extends BaseUpdatePageInterface
public function isImageWithTypeDisplayed(string $type): bool;
public function attachImage(string $path, string $type = null): void;
public function attachImage(string $path, ?string $type = null): void;
public function changeImageWithType(string $type, string $path): void;

4
src/Sylius/Behat/Page/Admin/Taxon/CreatePage.php
View File

@@ -91,7 +91,7 @@ class CreatePage extends BaseCreatePage implements CreatePageInterface
$this->getDocument()->fillField(sprintf('sylius_taxon_translations_%s_slug', $languageCode), $slug);
}
public function attachImage(string $path, string $type = null): void
public function attachImage(string $path, ?string $type = null): void
{
$filesPath = $this->getParameter('files_path');
@@ -102,7 +102,7 @@ class CreatePage extends BaseCreatePage implements CreatePageInterface
$imageForm->find('css', 'input[type="file"]')->attachFile($filesPath . $path);
}
public function getLeaves(TaxonInterface $parentTaxon = null): array
public function getLeaves(?TaxonInterface $parentTaxon = null): array
{
return $this->getDocument()->findAll('css', '.sylius-tree__item');
}

4
src/Sylius/Behat/Page/Admin/Taxon/CreatePageInterface.php
View File

@@ -36,14 +36,14 @@ interface CreatePageInterface extends BaseCreatePageInterface
public function specifySlug(string $slug, string $languageCode): void;
public function attachImage(string $path, string $type = null): void;
public function attachImage(string $path, ?string $type = null): void;
/**
* @return NodeElement[]
*
* @throws ElementNotFoundException
*/
public function getLeaves(TaxonInterface $parentTaxon = null): array;
public function getLeaves(?TaxonInterface $parentTaxon = null): array;
public function activateLanguageTab(string $locale): void;

2
src/Sylius/Behat/Page/Admin/Taxon/UpdatePage.php
View File

@@ -59,7 +59,7 @@ class UpdatePage extends BaseUpdatePage implements UpdatePageInterface
$this->getDocument()->fillField(sprintf('sylius_taxon_translations_%s_slug', $languageCode), $slug);
}
public function attachImage(string $path, string $type = null): void
public function attachImage(string $path, ?string $type = null): void
{
$filesPath = $this->getParameter('files_path');

2
src/Sylius/Behat/Page/Admin/Taxon/UpdatePageInterface.php
View File

@@ -29,7 +29,7 @@ interface UpdatePageInterface extends BaseUpdatePageInterface
public function specifySlug(string $slug, string $languageCode): void;
public function attachImage(string $path, string $type = null): void;
public function attachImage(string $path, ?string $type = null): void;
public function isImageWithTypeDisplayed(string $type): bool;

10
src/Sylius/Behat/Service/Converter/SectionAwareIriConverter.php
View File

@@ -43,17 +43,17 @@ final class SectionAwareIriConverter implements SectionAwareIriConverterInterfac
private RouterInterface $router,
PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory,
PropertyMetadataFactoryInterface $propertyMetadataFactory,
PropertyAccessorInterface $propertyAccessor = null,
IdentifiersExtractorInterface $identifiersExtractor = null,
ResourceClassResolverInterface $resourceClassResolver = null,
ResourceMetadataFactoryInterface $resourceMetadataFactory = null,
?PropertyAccessorInterface $propertyAccessor = null,
?IdentifiersExtractorInterface $identifiersExtractor = null,
?ResourceClassResolverInterface $resourceClassResolver = null,
?ResourceMetadataFactoryInterface $resourceMetadataFactory = null,
) {
$this->identifiersExtractor = $identifiersExtractor ?: new IdentifiersExtractor($propertyNameCollectionFactory, $propertyMetadataFactory, $propertyAccessor ?? PropertyAccess::createPropertyAccessor());
$this->resourceClassResolver = $resourceClassResolver;
$this->resourceMetadataFactory = $resourceMetadataFactory;
}
public function getIriFromResourceInSection(object $item, string $section, int $referenceType = null): string
public function getIriFromResourceInSection(object $item, string $section, ?int $referenceType = null): string
{
$resourceClass = $this->getResourceClass($item, true);

2
src/Sylius/Behat/Service/Converter/SectionAwareIriConverterInterface.php
View File

@@ -15,5 +15,5 @@ namespace Sylius\Behat\Service\Converter;
interface SectionAwareIriConverterInterface
{
public function getIriFromResourceInSection(object $item, string $section, int $referenceType = null): string;
public function getIriFromResourceInSection(object $item, string $section, ?int $referenceType = null): string;
}

2
src/Sylius/Behat/Service/Helper/JavaScriptTestHelper.php
View File

@@ -64,7 +64,7 @@ final class JavaScriptTestHelper implements JavaScriptTestHelperInterface
callable $callable,
string $exceptionClass,
?int $timeout = null,
NotificationType $type = null,
?NotificationType $type = null,
): void {
$start = microtime(true);
$timeout ??= $this->defaultTimeout;

2
src/Sylius/Bundle/ApiBundle/ApiPlatform/Metadata/MergingXmlExtractor.php
View File

@@ -35,7 +35,7 @@ final class MergingXmlExtractor extends AbstractResourceExtractor implements Pro
*/
public function __construct(
array $paths,
ContainerInterface $container = null,
?ContainerInterface $container = null,
private ?MetadataMergerInterface $merger = null,
) {
parent::__construct($paths, $container);

2
src/Sylius/Bundle/ApiBundle/CommandHandler/Checkout/Exception/OrderTotalHasChangedException.php
View File

@@ -21,7 +21,7 @@ class OrderTotalHasChangedException extends Exception
public function __construct(
string $message = 'Order total has changed during checkout process.',
int $code = 0,
Throwable $previous = null,
?Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

4
src/Sylius/Bundle/ApiBundle/DataProvider/AccountResetPasswordItemDataProvider.php
View File

@@ -19,12 +19,12 @@ use Sylius\Bundle\ApiBundle\Command\Account\ResetPassword;
final class AccountResetPasswordItemDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface
{
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
return new ResetPassword($id);
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, ResetPassword::class, true);
}

4
src/Sylius/Bundle/ApiBundle/DataProvider/AdminOrderItemAdjustmentsSubresourceDataProvider.php
View File

@@ -31,7 +31,7 @@ final class AdminOrderItemAdjustmentsSubresourceDataProvider implements Restrict
}
/** @param array<array-key, mixed> $context */
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return
is_a($resourceClass, AdjustmentInterface::class, true) &&
@@ -46,7 +46,7 @@ final class AdminOrderItemAdjustmentsSubresourceDataProvider implements Restrict
*
* @return iterable<AdjustmentInterface>
*/
public function getSubresource(string $resourceClass, array $identifiers, array $context, string $operationName = null): iterable
public function getSubresource(string $resourceClass, array $identifiers, array $context, ?string $operationName = null): iterable
{
$orderItem = $this->orderItemRepository->find(reset($context['subresource_identifiers']));
if (null === $orderItem) {

4
src/Sylius/Bundle/ApiBundle/DataProvider/AdminResetPasswordItemDataProvider.php
View File

@@ -19,12 +19,12 @@ use Sylius\Bundle\CoreBundle\Message\Admin\Account\ResetPassword;
final class AdminResetPasswordItemDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface
{
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
return new ResetPassword($id);
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, ResetPassword::class, true);
}

2
src/Sylius/Bundle/ApiBundle/DataProvider/ChannelAwareItemDataProvider.php
View File

@@ -26,7 +26,7 @@ final class ChannelAwareItemDataProvider implements ItemDataProviderInterface
) {
}
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = []): ?object
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = []): ?object
{
return $this->itemDataProvider->getItem($resourceClass, $id, $operationName, $this->processContext($context));
}

4
src/Sylius/Bundle/ApiBundle/DataProvider/ChannelsCollectionDataProvider.php
View File

@@ -24,12 +24,12 @@ final class ChannelsCollectionDataProvider implements ContextAwareCollectionData
{
}
public function getCollection(string $resourceClass, string $operationName = null, array $context = []): array
public function getCollection(string $resourceClass, ?string $operationName = null, array $context = []): array
{
return [$this->channelContext->getChannel()];
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, ChannelInterface::class, true) && $this->isShopGetCollectionOperation($context);
}

4
src/Sylius/Bundle/ApiBundle/DataProvider/CustomerItemDataProvider.php
View File

@@ -30,7 +30,7 @@ final class CustomerItemDataProvider implements RestrictedDataProviderInterface,
) {
}
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
/** @var ShopUserInterface|null $user */
$user = $this->userContext->getUser();
@@ -53,7 +53,7 @@ final class CustomerItemDataProvider implements RestrictedDataProviderInterface,
return null;
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, CustomerInterface::class, true);
}

4
src/Sylius/Bundle/ApiBundle/DataProvider/OrderAdjustmentsSubresourceDataProvider.php
View File

@@ -26,7 +26,7 @@ final class OrderAdjustmentsSubresourceDataProvider implements RestrictedDataPro
{
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
$subresourceIdentifiers = $context['subresource_identifiers'] ?? null;
@@ -37,7 +37,7 @@ final class OrderAdjustmentsSubresourceDataProvider implements RestrictedDataPro
;
}
public function getSubresource(string $resourceClass, array $identifiers, array $context, string $operationName = null)
public function getSubresource(string $resourceClass, array $identifiers, array $context, ?string $operationName = null)
{
$subresourceIdentifiers = $context['subresource_identifiers'];

4
src/Sylius/Bundle/ApiBundle/DataProvider/OrderItemAdjustmentsSubresourceDataProvider.php
View File

@@ -27,7 +27,7 @@ final class OrderItemAdjustmentsSubresourceDataProvider implements RestrictedDat
}
/** @param array<array-key, mixed> $context */
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
$subresourceIdentifiers = $context['subresource_identifiers'] ?? null;
@@ -43,7 +43,7 @@ final class OrderItemAdjustmentsSubresourceDataProvider implements RestrictedDat
*
* @return iterable<AdjustmentInterface>
*/
public function getSubresource(string $resourceClass, array $identifiers, array $context, string $operationName = null): iterable
public function getSubresource(string $resourceClass, array $identifiers, array $context, ?string $operationName = null): iterable
{
$subresourceIdentifiers = $context['subresource_identifiers'];

4
src/Sylius/Bundle/ApiBundle/DataProvider/OrderItemItemDataProvider.php
View File

@@ -30,12 +30,12 @@ final class OrderItemItemDataProvider implements ItemDataProviderInterface, Rest
) {
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, OrderItemInterface::class, true);
}
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
$user = $this->userContext->getUser();

4
src/Sylius/Bundle/ApiBundle/DataProvider/OrderItemUnitItemDataProvider.php
View File

@@ -30,12 +30,12 @@ final class OrderItemUnitItemDataProvider implements ItemDataProviderInterface,
) {
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, OrderItemUnitInterface::class, true);
}
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
$user = $this->userContext->getUser();

4
src/Sylius/Bundle/ApiBundle/DataProvider/PaymentItemDataProvider.php
View File

@@ -30,12 +30,12 @@ final class PaymentItemDataProvider implements ItemDataProviderInterface, Restri
) {
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, PaymentInterface::class, true);
}
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
$user = $this->userContext->getUser();

4
src/Sylius/Bundle/ApiBundle/DataProvider/PaymentMethodsCollectionDataProvider.php
View File

@@ -36,7 +36,7 @@ final class PaymentMethodsCollectionDataProvider implements ContextAwareCollecti
) {
}
public function getCollection(string $resourceClass, string $operationName = null, array $context = [])
public function getCollection(string $resourceClass, ?string $operationName = null, array $context = [])
{
/** @var ChannelInterface $channel */
$channel = $this->channelContext->getChannel();
@@ -66,7 +66,7 @@ final class PaymentMethodsCollectionDataProvider implements ContextAwareCollecti
return $this->paymentMethodsResolver->getSupportedMethods($payment);
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, PaymentMethodInterface::class, true) && $this->isShopGetCollectionOperation($context);
}

4
src/Sylius/Bundle/ApiBundle/DataProvider/ProductAttributesSubresourceDataProvider.php
View File

@@ -33,7 +33,7 @@ final class ProductAttributesSubresourceDataProvider implements RestrictedDataPr
) {
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
$subresourceIdentifiers = $context['subresource_identifiers'] ?? null;
@@ -43,7 +43,7 @@ final class ProductAttributesSubresourceDataProvider implements RestrictedDataPr
;
}
public function getSubresource(string $resourceClass, array $identifiers, array $context, string $operationName = null)
public function getSubresource(string $resourceClass, array $identifiers, array $context, ?string $operationName = null)
{
$subresourceIdentifiers = $context['subresource_identifiers'];

4
src/Sylius/Bundle/ApiBundle/DataProvider/ProductItemDataProvider.php
View File

@@ -31,7 +31,7 @@ final class ProductItemDataProvider implements RestrictedDataProviderInterface,
) {
}
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
$user = $this->userContext->getUser();
@@ -47,7 +47,7 @@ final class ProductItemDataProvider implements RestrictedDataProviderInterface,
return $this->productRepository->findOneByChannelAndCodeWithAvailableAssociations($channel, $id);
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, ProductInterface::class, true);
}

4
src/Sylius/Bundle/ApiBundle/DataProvider/ShipmentItemDataProvider.php
View File

@@ -30,12 +30,12 @@ final class ShipmentItemDataProvider implements ItemDataProviderInterface, Restr
) {
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, ShipmentInterface::class, true);
}
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
$user = $this->userContext->getUser();

4
src/Sylius/Bundle/ApiBundle/DataProvider/ShippingMethodsCollectionDataProvider.php
View File

@@ -33,7 +33,7 @@ final class ShippingMethodsCollectionDataProvider implements ContextAwareCollect
) {
}
public function getCollection(string $resourceClass, string $operationName = null, array $context = []): array
public function getCollection(string $resourceClass, ?string $operationName = null, array $context = []): array
{
/** @var ChannelInterface $channel */
$channel = $this->channelContext->getChannel();
@@ -57,7 +57,7 @@ final class ShippingMethodsCollectionDataProvider implements ContextAwareCollect
return $this->shippingMethodsResolver->getSupportedMethods($shipment);
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, ShippingMethodInterface::class, true) && $this->isShopGetCollectionOperation($context);
}

4
src/Sylius/Bundle/ApiBundle/DataProvider/VerifyCustomerAccountItemDataProvider.php
View File

@@ -19,12 +19,12 @@ use Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount;
final class VerifyCustomerAccountItemDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface
{
public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
public function getItem(string $resourceClass, $id, ?string $operationName = null, array $context = [])
{
return new VerifyCustomerAccount($id);
}
public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
{
return is_a($resourceClass, VerifyCustomerAccount::class, true);
}

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/AcceptedProductReviewsExtension.php
View File

@@ -28,7 +28,7 @@ final class AcceptedProductReviewsExtension implements ContextAwareQueryCollecti
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if ($this->productReviewClass !== $resourceClass) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/AddressesExtension.php
View File

@@ -33,7 +33,7 @@ final class AddressesExtension implements ContextAwareQueryCollectionExtensionIn
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, AddressInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/AvailableProductAssociationsInProductCollectionExtension.php
View File

@@ -29,7 +29,7 @@ final class AvailableProductAssociationsInProductCollectionExtension implements
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, ProductInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/CountryCollectionExtension.php
View File

@@ -32,7 +32,7 @@ final class CountryCollectionExtension implements ContextAwareQueryCollectionExt
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, CountryInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/CurrencyCollectionExtension.php
View File

@@ -32,7 +32,7 @@ final class CurrencyCollectionExtension implements ContextAwareQueryCollectionEx
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, CurrencyInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/HideArchivedPromotionExtension.php
View File

@@ -28,7 +28,7 @@ final class HideArchivedPromotionExtension implements ContextAwareQueryCollectio
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if ($this->promotionClass !== $resourceClass) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/HideArchivedShippingMethodExtension.php
View File

@@ -27,7 +27,7 @@ final class HideArchivedShippingMethodExtension implements ContextAwareQueryColl
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if ($this->shippingMethodClass !== $resourceClass) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/LocaleCollectionExtension.php
View File

@@ -32,7 +32,7 @@ final class LocaleCollectionExtension implements ContextAwareQueryCollectionExte
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, LocaleInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/OrdersByChannelExtension.php
View File

@@ -34,7 +34,7 @@ final class OrdersByChannelExtension implements ContextAwareQueryCollectionExten
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, OrderInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/OrdersByLoggedInUserExtension.php
View File

@@ -33,7 +33,7 @@ final class OrdersByLoggedInUserExtension implements ContextAwareQueryCollection
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, OrderInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/ProductsByChannelAndLocaleCodeExtension.php
View File

@@ -31,7 +31,7 @@ final class ProductsByChannelAndLocaleCodeExtension implements ContextAwareQuery
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, ProductInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/ProductsByTaxonExtension.php
View File

@@ -30,7 +30,7 @@ final class ProductsByTaxonExtension implements ContextAwareQueryCollectionExten
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, ProductInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/RestrictingFilterEagerLoadingExtension.php
View File

@@ -27,7 +27,7 @@ final class RestrictingFilterEagerLoadingExtension implements ContextAwareQueryC
{
}
public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, string $operationName = null, array $context = []): void
public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?string $operationName = null, array $context = []): void
{
if ($this->isOperationRestricted($resourceClass, $operationName)) {
return;

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryCollectionExtension/TaxonCollectionExtension.php
View File

@@ -32,7 +32,7 @@ final class TaxonCollectionExtension implements ContextAwareQueryCollectionExten
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, TaxonInterface::class, true)) {

4
src/Sylius/Bundle/ApiBundle/Doctrine/QueryExtension/ExchangeRateExtension.php
View File

@@ -33,7 +33,7 @@ final class ExchangeRateExtension implements ContextAwareQueryCollectionExtensio
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
if (!is_a($resourceClass, ExchangeRate::class, true)) {
@@ -62,7 +62,7 @@ final class ExchangeRateExtension implements ContextAwareQueryCollectionExtensio
;
}
public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, ?string $operationName = null, array $context = [])
{
$this->applyToCollection($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);
}

4
src/Sylius/Bundle/ApiBundle/Doctrine/QueryExtension/OrderExtension.php
View File

@@ -40,7 +40,7 @@ final class OrderExtension implements ContextAwareQueryCollectionExtensionInterf
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
$this->filterOutOrders($queryBuilder, $queryNameGenerator, $resourceClass);
@@ -55,7 +55,7 @@ final class OrderExtension implements ContextAwareQueryCollectionExtensionInterf
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
array $identifiers,
string $operationName = null,
?string $operationName = null,
array $context = [],
): void {
$this->filterOutOrders($queryBuilder, $queryNameGenerator, $resourceClass);

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/AddressItemExtension.php
View File

@@ -36,7 +36,7 @@ final class AddressItemExtension implements QueryItemExtensionInterface
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
array $identifiers,
string $operationName = null,
?string $operationName = null,
array $context = [],
) {
if (!is_a($resourceClass, AddressInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/EnabledProductInProductAssociationItemExtension.php
View File

@@ -33,7 +33,7 @@ final class EnabledProductInProductAssociationItemExtension implements QueryItem
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
array $identifiers,
string $operationName = null,
?string $operationName = null,
array $context = [],
) {
if (!is_a($resourceClass, ProductAssociationInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/EnabledProductVariantItemExtension.php
View File

@@ -30,7 +30,7 @@ final class EnabledProductVariantItemExtension implements QueryItemExtensionInte
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
array $identifiers,
string $operationName = null,
?string $operationName = null,
array $context = [],
) {
if (!is_a($resourceClass, ProductVariantInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderShopUserItemExtension.php
View File

@@ -35,7 +35,7 @@ final class OrderShopUserItemExtension implements QueryItemExtensionInterface
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
array $identifiers,
string $operationName = null,
?string $operationName = null,
array $context = [],
) {
if (!is_a($resourceClass, OrderInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderVisitorItemExtension.php
View File

@@ -34,7 +34,7 @@ final class OrderVisitorItemExtension implements QueryItemExtensionInterface
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
array $identifiers,
string $operationName = null,
?string $operationName = null,
array $context = [],
) {
if (!is_a($resourceClass, OrderInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/TaxonItemExtension.php
View File

@@ -30,7 +30,7 @@ final class TaxonItemExtension implements QueryItemExtensionInterface
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
array $identifiers,
string $operationName = null,
?string $operationName = null,
array $context = [],
) {
if (!is_a($resourceClass, TaxonInterface::class, true)) {

2
src/Sylius/Bundle/ApiBundle/Exception/ChannelCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class ChannelCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot remove, the channel is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/ChannelNotFoundException.php
View File

@@ -19,7 +19,7 @@ final class ChannelNotFoundException extends NotFoundHttpException
{
public function __construct(
string $message = 'Channel not found.',
\Throwable $previous = null,
?\Throwable $previous = null,
int $code = 0,
) {
parent::__construct($message, $previous, $code);

2
src/Sylius/Bundle/ApiBundle/Exception/ChannelPricingChannelCodeMismatchException.php
View File

@@ -18,7 +18,7 @@ final class ChannelPricingChannelCodeMismatchException extends \RuntimeException
public function __construct(
string $message = 'The channelCode of channelPricing does not match the key.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/InvalidProductAttributeValueTypeException.php
View File

@@ -18,7 +18,7 @@ final class InvalidProductAttributeValueTypeException extends \RuntimeException
public function __construct(
string $message = 'The value of attribute has an invalid type.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/InvalidRequestArgumentException.php
View File

@@ -18,7 +18,7 @@ final class InvalidRequestArgumentException extends \RuntimeException
public function __construct(
string $message = 'Request argument is invalid.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/LocaleIsUsedException.php
View File

@@ -20,7 +20,7 @@ class LocaleIsUsedException extends Exception
public function __construct(
string $localeCode,
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
$message = sprintf('Locale "%s" is used.', $localeCode);

2
src/Sylius/Bundle/ApiBundle/Exception/NoFileUploadedException.php
View File

@@ -20,7 +20,7 @@ final class NoFileUploadedException extends BadRequestHttpException
/** @param array<array-key, mixed> $headers */
public function __construct(
string $message = 'No file was uploaded.',
\Throwable $previous = null,
?\Throwable $previous = null,
int $code = 0,
array $headers = [],
) {

2
src/Sylius/Bundle/ApiBundle/Exception/PaymentMethodCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class PaymentMethodCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot remove, the payment method is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/ProductAttributeCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class ProductAttributeCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot delete, the product attribute is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/ProductCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class ProductCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot delete, the product is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/ProductVariantCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class ProductVariantCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot delete, the product variant is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/PromotionCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class PromotionCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot delete, the promotion is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/PromotionCouponCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class PromotionCouponCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot delete, the promotion coupon is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/PromotionNotFoundException.php
View File

@@ -21,7 +21,7 @@ final class PromotionNotFoundException extends NotFoundHttpException
public function __construct(
string $promotionCode,
string $message = 'Promotion with the "%s" code not found.',
\Throwable $previous = null,
?\Throwable $previous = null,
int $code = 0,
array $headers = [],
) {

2
src/Sylius/Bundle/ApiBundle/Exception/ProvinceCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class ProvinceCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot delete, the province is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/ShippingMethodCannotBeRemoved.php
View File

@@ -18,7 +18,7 @@ final class ShippingMethodCannotBeRemoved extends \RuntimeException
public function __construct(
string $message = 'Cannot delete, the shipping method is in use.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

2
src/Sylius/Bundle/ApiBundle/Exception/StateMachineTransitionFailedException.php
View File

@@ -18,7 +18,7 @@ final class StateMachineTransitionFailedException extends \RuntimeException
public function __construct(
string $message = 'Transition failed.',
int $code = 0,
\Throwable $previous = null,
?\Throwable $previous = null,
) {
parent::__construct($message, $code, $previous);
}

Some files were not shown because too many files have changed in this diff Show More