From bc7421d011690dca3a0a4f443720deb111d1070c Mon Sep 17 00:00:00 2001 From: janpalen Date: Wed, 14 Aug 2024 10:18:59 +0200 Subject: [PATCH] OP-476 - Add phpStan --- phpstan.neon | 14 ++++++++ .../CompanyBlacklistingRuleChecker.php | 2 +- .../PhoneNumberBlacklistingRuleChecker.php | 3 +- .../ProvinceBlacklistingRuleChecker.php | 2 +- .../BlacklistingRuleEligibilityChecker.php | 6 +++- ...listingRuleEligibilityCheckerInterface.php | 2 +- .../CustomerIpBlacklistingRuleChecker.php | 3 +- .../AutomaticBlacklistingConfiguration.php | 6 ++-- .../FraudPrevention/BlacklistingRule.php | 6 ++-- src/Entity/FraudPrevention/FraudSuspicion.php | 36 +++++++++---------- .../FraudSuspicionInterface.php | 20 +++++------ .../FraudSuspicionEntityListener.php | 2 +- ...icBlacklistingConfigurationElementType.php | 8 +++-- src/Form/Type/BlacklistingRuleType.php | 2 +- src/Model/FraudSuspicionCommonModel.php | 36 +++++++++---------- .../FraudSuspicionCommonModelInterface.php | 18 +++++----- .../AddFraudSuspicionWithSettings.php | 7 ++-- ...AddFraudSuspicionWithSettingsValidator.php | 2 +- .../BlacklistingRuleCustomerGroups.php | 5 ++- ...lacklistingRuleCustomerGroupsValidator.php | 2 +- .../Checkout/CheckoutAddressType.php | 5 ++- .../Checkout/CheckoutAddressTypeValidator.php | 2 +- .../Page/Admin/FraudSuspicion/CreatePage.php | 2 +- 23 files changed, 111 insertions(+), 80 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 2d625f6d..283d7d21 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,10 +1,14 @@ parameters: reportUnmatchedIgnoredErrors: false checkMissingIterableValueType: false + checkGenericClassInNonGenericObjectType: false excludes_analyse: # Makes PHPStan crash - 'src/DependencyInjection/Configuration.php' + - 'src/Repository' + - 'src/Processor/AutomaticBlacklistingRulesProcessor.php' + - 'src/Factory/FraudSuspicionFactory.php' # Test dependencies - 'tests/Application/app/**.php' @@ -12,3 +16,13 @@ parameters: ignoreErrors: - '/Parameter #1 \$configuration of method Symfony\\Component\\DependencyInjection\\Extension\\Extension::processConfiguration\(\) expects Symfony\\Component\\Config\\Definition\\ConfigurationInterface, Symfony\\Component\\Config\\Definition\\ConfigurationInterface\|null given\./' + - '/Parameter #1 \$customer of method BitBag\\SyliusBlacklistPlugin\\Model\\FraudSuspicionCommonModelInterface::setCustomer\(\) expects Sylius\\Component\\Customer\\Model\\CustomerInterface, Sylius\\Component\\Customer\\Model\\CustomerInterface\|null given\./' + - '/Parameter #1 \$customer of method BitBag\\SyliusBlacklistPlugin\\StateResolver\\CustomerStateResolverInterface::changeStateOnBlacklisted\(\) expects Sylius\\Component\\Customer\\Model\\CustomerInterface, Sylius\\Component\\Customer\\Model\\CustomerInterface\|null given\./' + - '#Access to an undefined property Symfony\\Component\\Validator\\Constraint::\$.+#' + - '#Call to an undefined method .+::[a-zA-Z]+\(\).#' + - '#Argument of an invalid type array\|null supplied for foreach, only iterables are supported.#' + - '#Cannot call method [a-zA-Z]+\(.*\) on .+\\?null#' + - '#Property .+::\$[a-zA-Z]+ is never read, only written.#' + - '#Call to an undefined method .+::[a-zA-Z]+\(\).#' + + diff --git a/src/Checker/BlacklistingRule/Address/CompanyBlacklistingRuleChecker.php b/src/Checker/BlacklistingRule/Address/CompanyBlacklistingRuleChecker.php index db3fa53c..f8480ee7 100644 --- a/src/Checker/BlacklistingRule/Address/CompanyBlacklistingRuleChecker.php +++ b/src/Checker/BlacklistingRule/Address/CompanyBlacklistingRuleChecker.php @@ -22,7 +22,7 @@ class CompanyBlacklistingRuleChecker implements BlacklistingRuleCheckerInterface public function checkIfCustomerIsBlacklisted(QueryBuilder $builder, FraudSuspicionCommonModelInterface $fraudSuspicionCommonModel): void { - if (!empty($fraudSuspicionCommonModel->getCompany())) { + if (null !== $fraudSuspicionCommonModel->getCompany() && '' !== $fraudSuspicionCommonModel->getCompany()) { $builder ->andWhere('o.company = :company') ->setParameter('company', $fraudSuspicionCommonModel->getCompany()) diff --git a/src/Checker/BlacklistingRule/Address/PhoneNumberBlacklistingRuleChecker.php b/src/Checker/BlacklistingRule/Address/PhoneNumberBlacklistingRuleChecker.php index 59043852..fb3412a0 100644 --- a/src/Checker/BlacklistingRule/Address/PhoneNumberBlacklistingRuleChecker.php +++ b/src/Checker/BlacklistingRule/Address/PhoneNumberBlacklistingRuleChecker.php @@ -22,7 +22,8 @@ class PhoneNumberBlacklistingRuleChecker implements BlacklistingRuleCheckerInter public function checkIfCustomerIsBlacklisted(QueryBuilder $builder, FraudSuspicionCommonModelInterface $fraudSuspicionCommonModel): void { - if (!empty($fraudSuspicionCommonModel->getPhoneNumber())) { + if (null !== $fraudSuspicionCommonModel->getPhoneNumber() && + '' !== $fraudSuspicionCommonModel->getPhoneNumber()) { $builder ->andWhere('o.phoneNumber = :phoneNumber') ->setParameter('phoneNumber', $fraudSuspicionCommonModel->getPhoneNumber()) diff --git a/src/Checker/BlacklistingRule/Address/ProvinceBlacklistingRuleChecker.php b/src/Checker/BlacklistingRule/Address/ProvinceBlacklistingRuleChecker.php index 47a14766..dd58948a 100644 --- a/src/Checker/BlacklistingRule/Address/ProvinceBlacklistingRuleChecker.php +++ b/src/Checker/BlacklistingRule/Address/ProvinceBlacklistingRuleChecker.php @@ -22,7 +22,7 @@ class ProvinceBlacklistingRuleChecker implements BlacklistingRuleCheckerInterfac public function checkIfCustomerIsBlacklisted(QueryBuilder $builder, FraudSuspicionCommonModelInterface $fraudSuspicionCommonModel): void { - if (!empty($fraudSuspicionCommonModel->getProvince())) { + if (null !== $fraudSuspicionCommonModel->getProvince() && '' !== $fraudSuspicionCommonModel->getProvince()) { $builder ->andWhere('o.province = :province') ->setParameter('province', $fraudSuspicionCommonModel->getProvince()) diff --git a/src/Checker/BlacklistingRule/BlacklistingRuleEligibilityChecker.php b/src/Checker/BlacklistingRule/BlacklistingRuleEligibilityChecker.php index 899ceeea..a0d40156 100644 --- a/src/Checker/BlacklistingRule/BlacklistingRuleEligibilityChecker.php +++ b/src/Checker/BlacklistingRule/BlacklistingRuleEligibilityChecker.php @@ -16,8 +16,12 @@ final class BlacklistingRuleEligibilityChecker implements BlacklistingRuleEligibilityCheckerInterface { - public function isEligible(BlacklistingRuleInterface $blacklistingRule, CustomerInterface $customer): bool + public function isEligible(BlacklistingRuleInterface $blacklistingRule, ?CustomerInterface $customer): bool { + if (null === $customer) { + return false; + } + if ($blacklistingRule->isOnlyForGuests() && null !== $customer->getUser()) { return false; } diff --git a/src/Checker/BlacklistingRule/BlacklistingRuleEligibilityCheckerInterface.php b/src/Checker/BlacklistingRule/BlacklistingRuleEligibilityCheckerInterface.php index 84abfe98..2e498a4d 100644 --- a/src/Checker/BlacklistingRule/BlacklistingRuleEligibilityCheckerInterface.php +++ b/src/Checker/BlacklistingRule/BlacklistingRuleEligibilityCheckerInterface.php @@ -16,5 +16,5 @@ interface BlacklistingRuleEligibilityCheckerInterface { - public function isEligible(BlacklistingRuleInterface $blacklistingRule, CustomerInterface $customer): bool; + public function isEligible(BlacklistingRuleInterface $blacklistingRule, ?CustomerInterface $customer): bool; } diff --git a/src/Checker/BlacklistingRule/Customer/CustomerIpBlacklistingRuleChecker.php b/src/Checker/BlacklistingRule/Customer/CustomerIpBlacklistingRuleChecker.php index 8f83bdc6..4b9c8adc 100644 --- a/src/Checker/BlacklistingRule/Customer/CustomerIpBlacklistingRuleChecker.php +++ b/src/Checker/BlacklistingRule/Customer/CustomerIpBlacklistingRuleChecker.php @@ -22,7 +22,8 @@ class CustomerIpBlacklistingRuleChecker implements BlacklistingRuleCheckerInterf public function checkIfCustomerIsBlacklisted(QueryBuilder $builder, FraudSuspicionCommonModelInterface $fraudSuspicionCommonModel): void { - if (!empty($fraudSuspicionCommonModel->getCustomerIp())) { + if (null !== $fraudSuspicionCommonModel->getCustomerIp() && + '' !== $fraudSuspicionCommonModel->getCustomerIp()) { $builder ->andWhere('o.customerIp = :customerIp') ->setParameter('customerIp', $fraudSuspicionCommonModel->getCustomerIp()) diff --git a/src/Entity/FraudPrevention/AutomaticBlacklistingConfiguration.php b/src/Entity/FraudPrevention/AutomaticBlacklistingConfiguration.php index 486bd947..fc83b6d8 100644 --- a/src/Entity/FraudPrevention/AutomaticBlacklistingConfiguration.php +++ b/src/Entity/FraudPrevention/AutomaticBlacklistingConfiguration.php @@ -25,7 +25,7 @@ class AutomaticBlacklistingConfiguration implements AutomaticBlacklistingConfigu /** @var int|null */ protected $id; - /** @var string */ + /** @var string|null */ protected $name; /** @@ -43,10 +43,10 @@ class AutomaticBlacklistingConfiguration implements AutomaticBlacklistingConfigu /** @var bool */ protected $addFraudSuspicion = false; - /** @var int */ + /** @var int|null */ protected $permittedFraudSuspicionsNumber; - /** @var string */ + /** @var string|null */ protected $permittedFraudSuspicionsTime; public function __construct() diff --git a/src/Entity/FraudPrevention/BlacklistingRule.php b/src/Entity/FraudPrevention/BlacklistingRule.php index 4771f97b..b40a5111 100644 --- a/src/Entity/FraudPrevention/BlacklistingRule.php +++ b/src/Entity/FraudPrevention/BlacklistingRule.php @@ -26,13 +26,13 @@ class BlacklistingRule implements BlacklistingRuleInterface /** @var int|null */ protected $id; - /** @var string */ + /** @var string|null */ protected $name; /** @var array */ protected $attributes = []; - /** @var int */ + /** @var int|null */ protected $permittedStrikes; /** @var bool */ @@ -86,7 +86,7 @@ public function addAttribute(string $attribute): void public function removeAttribute(string $attribute): void { - $index = array_search($attribute, $this->attributes); + $index = array_search($attribute, $this->attributes, true); if (false !== $index) { unset($this->attributes[$index]); diff --git a/src/Entity/FraudPrevention/FraudSuspicion.php b/src/Entity/FraudPrevention/FraudSuspicion.php index f2b3bc06..89d0da74 100644 --- a/src/Entity/FraudPrevention/FraudSuspicion.php +++ b/src/Entity/FraudPrevention/FraudSuspicion.php @@ -31,28 +31,28 @@ class FraudSuspicion implements FraudSuspicionInterface /** @var string|null */ protected $company; - /** @var string */ + /** @var string|null */ protected $firstName; - /** @var string */ + /** @var string|null */ protected $lastName; - /** @var string */ + /** @var string|null */ protected $email; - /** @var string */ + /** @var string|null */ protected $phoneNumber; - /** @var string */ + /** @var string|null */ protected $street; - /** @var string */ + /** @var string|null */ protected $city; - /** @var string */ + /** @var string|null */ protected $province; - /** @var string */ + /** @var string|null */ protected $country; /** @var string|null */ @@ -100,7 +100,7 @@ public function getCompany(): ?string return $this->company; } - public function setCompany(?string $company) + public function setCompany(?string $company): void { $this->company = $company; } @@ -110,7 +110,7 @@ public function getFirstName(): ?string return $this->firstName; } - public function setFirstName(?string $firstName) + public function setFirstName(?string $firstName): void { $this->firstName = $firstName; } @@ -120,7 +120,7 @@ public function getLastName(): ?string return $this->lastName; } - public function setLastName(?string $lastName) + public function setLastName(?string $lastName): void { $this->lastName = $lastName; } @@ -130,7 +130,7 @@ public function getEmail(): ?string return $this->email; } - public function setEmail(?string $email) + public function setEmail(?string $email): void { $this->email = $email; } @@ -140,7 +140,7 @@ public function getPhoneNumber(): ?string return $this->phoneNumber; } - public function setPhoneNumber(?string $phoneNumber) + public function setPhoneNumber(?string $phoneNumber): void { $this->phoneNumber = $phoneNumber; } @@ -150,7 +150,7 @@ public function getStreet(): ?string return $this->street; } - public function setStreet(?string $street) + public function setStreet(?string $street): void { $this->street = $street; } @@ -160,7 +160,7 @@ public function getCity(): ?string return $this->city; } - public function setCity(?string $city) + public function setCity(?string $city): void { $this->city = $city; } @@ -170,7 +170,7 @@ public function getProvince(): ?string return $this->province; } - public function setProvince(?string $province) + public function setProvince(?string $province): void { $this->province = $province; } @@ -180,7 +180,7 @@ public function getCountry(): ?string return $this->country; } - public function setCountry(?string $country) + public function setCountry(?string $country): void { $this->country = $country; } @@ -210,7 +210,7 @@ public function getAddressType(): ?string return $this->addressType; } - public function setAddressType(string $addressType) + public function setAddressType(string $addressType): void { $this->addressType = $addressType; } diff --git a/src/Entity/FraudPrevention/FraudSuspicionInterface.php b/src/Entity/FraudPrevention/FraudSuspicionInterface.php index 1d8f4356..ca2ed458 100644 --- a/src/Entity/FraudPrevention/FraudSuspicionInterface.php +++ b/src/Entity/FraudPrevention/FraudSuspicionInterface.php @@ -42,39 +42,39 @@ public function setCustomer(CustomerInterface $customer): void; public function getCompany(): ?string; - public function setCompany(?string $company); + public function setCompany(?string $company): void; public function getFirstName(): ?string; - public function setFirstName(?string $firstName); + public function setFirstName(?string $firstName): void; public function getLastName(): ?string; - public function setLastName(?string $lastName); + public function setLastName(?string $lastName): void; public function getEmail(): ?string; - public function setEmail(?string $email); + public function setEmail(?string $email): void; public function getPhoneNumber(): ?string; - public function setPhoneNumber(?string $phoneNumber); + public function setPhoneNumber(?string $phoneNumber): void; public function getStreet(): ?string; - public function setStreet(?string $street); + public function setStreet(?string $street): void; public function getCity(): ?string; - public function setCity(?string $city); + public function setCity(?string $city): void; public function getProvince(): ?string; - public function setProvince(?string $province); + public function setProvince(?string $province): void; public function getCountry(): ?string; - public function setCountry(?string $country); + public function setCountry(?string $country): void; public function getPostcode(): ?string; @@ -86,7 +86,7 @@ public function setCustomerIp(?string $customerIp): void; public function getAddressType(): ?string; - public function setAddressType(string $addressType); + public function setAddressType(string $addressType): void; public function getComment(): ?string; diff --git a/src/EntityListener/FraudSuspicionEntityListener.php b/src/EntityListener/FraudSuspicionEntityListener.php index 6d84a8e3..701e923c 100644 --- a/src/EntityListener/FraudSuspicionEntityListener.php +++ b/src/EntityListener/FraudSuspicionEntityListener.php @@ -38,7 +38,7 @@ public function __construct( $this->fraudSuspicionCommonModelConverter = $fraudSuspicionCommonModelConverter; } - public function prePersist(FraudSuspicionInterface $newFraudSuspicion, LifecycleEventArgs $event) + public function prePersist(FraudSuspicionInterface $newFraudSuspicion, LifecycleEventArgs $event): void { $fraudSuspicionCommonModel = $this->fraudSuspicionCommonModelConverter->convertFraudSuspicionObject($newFraudSuspicion); diff --git a/src/Form/Type/AbstractConfigurableAutomaticBlacklistingConfigurationElementType.php b/src/Form/Type/AbstractConfigurableAutomaticBlacklistingConfigurationElementType.php index f54bc836..d1e3fe30 100644 --- a/src/Form/Type/AbstractConfigurableAutomaticBlacklistingConfigurationElementType.php +++ b/src/Form/Type/AbstractConfigurableAutomaticBlacklistingConfigurationElementType.php @@ -78,15 +78,17 @@ public function configureOptions(OptionsResolver $resolver): void ; } - protected function addConfigurationFields(FormInterface $form, string $configurationType): void + protected function addConfigurationFields(FormInterface $form, ?string $configurationType): void { $form->add('settings', $configurationType, [ 'label' => false, ]); } - protected function getRegistryIdentifier(FormInterface $form, $data = null): ?string - { + protected function getRegistryIdentifier( + FormInterface $form, + AutomaticBlacklistingRuleInterface $data = null, + ): ?string { if ($data instanceof AutomaticBlacklistingRuleInterface && null !== $data->getType()) { return $data->getType(); } diff --git a/src/Form/Type/BlacklistingRuleType.php b/src/Form/Type/BlacklistingRuleType.php index 954286d0..42770667 100644 --- a/src/Form/Type/BlacklistingRuleType.php +++ b/src/Form/Type/BlacklistingRuleType.php @@ -25,7 +25,7 @@ final class BlacklistingRuleType extends AbstractResourceType /** @var array */ private $attributeChoices; - /* @var string */ + /** @var string */ private $customerGroupClass; public function __construct( diff --git a/src/Model/FraudSuspicionCommonModel.php b/src/Model/FraudSuspicionCommonModel.php index 990d2f18..19ebd961 100644 --- a/src/Model/FraudSuspicionCommonModel.php +++ b/src/Model/FraudSuspicionCommonModel.php @@ -19,34 +19,34 @@ class FraudSuspicionCommonModel implements FraudSuspicionCommonModelInterface /** @var OrderInterface|null */ protected $order; - /** @var CustomerInterface */ + /** @var CustomerInterface|null */ protected $customer; /** @var string|null */ protected $company; - /** @var string */ + /** @var string|null */ protected $firstName; - /** @var string */ + /** @var string|null */ protected $lastName; - /** @var string */ + /** @var string|null */ protected $email; - /** @var string */ + /** @var string|null */ protected $phoneNumber; - /** @var string */ + /** @var string|null */ protected $street; - /** @var string */ + /** @var string|null */ protected $city; - /** @var string */ + /** @var string|null */ protected $province; - /** @var string */ + /** @var string|null */ protected $country; /** @var string|null */ @@ -70,7 +70,7 @@ public function getCustomer(): ?CustomerInterface return $this->customer; } - public function setCustomer(CustomerInterface $customer): void + public function setCustomer(?CustomerInterface $customer): void { $this->customer = $customer; } @@ -80,7 +80,7 @@ public function getCompany(): ?string return $this->company; } - public function setCompany(?string $company) + public function setCompany(?string $company): void { $this->company = $company; } @@ -90,7 +90,7 @@ public function getFirstName(): ?string return $this->firstName; } - public function setFirstName(?string $firstName) + public function setFirstName(?string $firstName): void { $this->firstName = $firstName; } @@ -100,7 +100,7 @@ public function getLastName(): ?string return $this->lastName; } - public function setLastName(?string $lastName) + public function setLastName(?string $lastName): void { $this->lastName = $lastName; } @@ -110,7 +110,7 @@ public function getEmail(): ?string return $this->email; } - public function setEmail(?string $email) + public function setEmail(?string $email): void { $this->email = $email; } @@ -130,7 +130,7 @@ public function getStreet(): ?string return $this->street; } - public function setStreet(?string $street) + public function setStreet(?string $street): void { $this->street = $street; } @@ -140,7 +140,7 @@ public function getCity(): ?string return $this->city; } - public function setCity(?string $city) + public function setCity(?string $city): void { $this->city = $city; } @@ -150,7 +150,7 @@ public function getProvince(): ?string return $this->province; } - public function setProvince(?string $province) + public function setProvince(?string $province): void { $this->province = $province; } @@ -160,7 +160,7 @@ public function getCountry(): ?string return $this->country; } - public function setCountry(?string $country) + public function setCountry(?string $country): void { $this->country = $country; } diff --git a/src/Model/FraudSuspicionCommonModelInterface.php b/src/Model/FraudSuspicionCommonModelInterface.php index 8f959834..1b275739 100644 --- a/src/Model/FraudSuspicionCommonModelInterface.php +++ b/src/Model/FraudSuspicionCommonModelInterface.php @@ -22,23 +22,23 @@ public function setOrder(?OrderInterface $order): void; public function getCustomer(): ?CustomerInterface; - public function setCustomer(CustomerInterface $customer): void; + public function setCustomer(?CustomerInterface $customer): void; public function getCompany(): ?string; - public function setCompany(?string $company); + public function setCompany(?string $company): void; public function getFirstName(): ?string; - public function setFirstName(?string $firstName); + public function setFirstName(?string $firstName): void; public function getLastName(): ?string; - public function setLastName(?string $lastName); + public function setLastName(?string $lastName): void; public function getEmail(): ?string; - public function setEmail(?string $email); + public function setEmail(?string $email): void; public function getPhoneNumber(): ?string; @@ -46,19 +46,19 @@ public function setPhoneNumber(?string $phoneNumber): void; public function getStreet(): ?string; - public function setStreet(?string $street); + public function setStreet(?string $street): void; public function getCity(): ?string; - public function setCity(?string $city); + public function setCity(?string $city): void; public function getProvince(): ?string; - public function setProvince(?string $province); + public function setProvince(?string $province): void; public function getCountry(): ?string; - public function setCountry(?string $country); + public function setCountry(?string $country): void; public function getPostcode(): ?string; diff --git a/src/Validator/Constraints/AutomaticBlacklistingConfiguration/AddFraudSuspicionWithSettings.php b/src/Validator/Constraints/AutomaticBlacklistingConfiguration/AddFraudSuspicionWithSettings.php index 60e77c71..d5081a99 100644 --- a/src/Validator/Constraints/AutomaticBlacklistingConfiguration/AddFraudSuspicionWithSettings.php +++ b/src/Validator/Constraints/AutomaticBlacklistingConfiguration/AddFraudSuspicionWithSettings.php @@ -15,9 +15,9 @@ final class AddFraudSuspicionWithSettings extends Constraint { - public $fraudSuspicionsNumberNotBlankMessage = 'bitbag_sylius_blacklist_plugin.automatic_blacklisting_configuration.fraud_suspicions_number.not_blank'; + public string $fraudSuspicionsNumberNotBlankMessage = 'bitbag_sylius_blacklist_plugin.automatic_blacklisting_configuration.fraud_suspicions_number.not_blank'; - public $fraudSuspicionTimeNotBlankMessage = 'bitbag_sylius_blacklist_plugin.automatic_blacklisting_configuration.fraud_suspicions_time.not_blank'; + public string $fraudSuspicionTimeNotBlankMessage = 'bitbag_sylius_blacklist_plugin.automatic_blacklisting_configuration.fraud_suspicions_time.not_blank'; /** @var array */ public $options; @@ -27,6 +27,9 @@ public function validatedBy(): string return AddFraudSuspicionWithSettingsValidator::class; } + /** + * @return array + */ public function getTargets(): array { return [self::CLASS_CONSTRAINT]; diff --git a/src/Validator/Constraints/AutomaticBlacklistingConfiguration/AddFraudSuspicionWithSettingsValidator.php b/src/Validator/Constraints/AutomaticBlacklistingConfiguration/AddFraudSuspicionWithSettingsValidator.php index 3aa8eb4d..8c96123d 100644 --- a/src/Validator/Constraints/AutomaticBlacklistingConfiguration/AddFraudSuspicionWithSettingsValidator.php +++ b/src/Validator/Constraints/AutomaticBlacklistingConfiguration/AddFraudSuspicionWithSettingsValidator.php @@ -18,7 +18,7 @@ final class AddFraudSuspicionWithSettingsValidator extends ConstraintValidator { - public function validate($automaticBlacklistingConfiguration, Constraint $constraint): void + public function validate(mixed $automaticBlacklistingConfiguration, Constraint $constraint): void { Assert::isInstanceOf($automaticBlacklistingConfiguration, AutomaticBlacklistingConfigurationInterface::class); diff --git a/src/Validator/Constraints/BlacklistingRule/BlacklistingRuleCustomerGroups.php b/src/Validator/Constraints/BlacklistingRule/BlacklistingRuleCustomerGroups.php index b7655ba3..958a2210 100644 --- a/src/Validator/Constraints/BlacklistingRule/BlacklistingRuleCustomerGroups.php +++ b/src/Validator/Constraints/BlacklistingRule/BlacklistingRuleCustomerGroups.php @@ -15,7 +15,7 @@ class BlacklistingRuleCustomerGroups extends Constraint { - public $message = 'bitbag_sylius_blacklist_plugin.blacklisting_rule.guests_cannot_have_group'; + public string $message = 'bitbag_sylius_blacklist_plugin.blacklisting_rule.guests_cannot_have_group'; /** @var array */ public $options; @@ -25,6 +25,9 @@ public function validatedBy(): string return BlacklistingRuleCustomerGroupsValidator::class; } + /** + * @return array + */ public function getTargets(): array { return [self::CLASS_CONSTRAINT]; diff --git a/src/Validator/Constraints/BlacklistingRule/BlacklistingRuleCustomerGroupsValidator.php b/src/Validator/Constraints/BlacklistingRule/BlacklistingRuleCustomerGroupsValidator.php index 7c63f82a..86cb1aac 100644 --- a/src/Validator/Constraints/BlacklistingRule/BlacklistingRuleCustomerGroupsValidator.php +++ b/src/Validator/Constraints/BlacklistingRule/BlacklistingRuleCustomerGroupsValidator.php @@ -18,7 +18,7 @@ class BlacklistingRuleCustomerGroupsValidator extends ConstraintValidator { - public function validate($blacklistingRule, Constraint $constraint): void + public function validate(mixed $blacklistingRule, Constraint $constraint): void { Assert::isInstanceOf($blacklistingRule, BlacklistingRuleInterface::class); diff --git a/src/Validator/Constraints/Checkout/CheckoutAddressType.php b/src/Validator/Constraints/Checkout/CheckoutAddressType.php index 6fa87338..892bcff3 100644 --- a/src/Validator/Constraints/Checkout/CheckoutAddressType.php +++ b/src/Validator/Constraints/Checkout/CheckoutAddressType.php @@ -15,7 +15,7 @@ class CheckoutAddressType extends Constraint { - public $message = 'bitbag_sylius_blacklist_plugin.form.error.cannot_place_order'; + public string $message = 'bitbag_sylius_blacklist_plugin.form.error.cannot_place_order'; /** @var array */ public $options; @@ -25,6 +25,9 @@ public function validatedBy(): string return CheckoutAddressTypeValidator::class; } + /** + * @return array + */ public function getTargets(): array { return [self::CLASS_CONSTRAINT]; diff --git a/src/Validator/Constraints/Checkout/CheckoutAddressTypeValidator.php b/src/Validator/Constraints/Checkout/CheckoutAddressTypeValidator.php index 5dafb329..8cfb641b 100644 --- a/src/Validator/Constraints/Checkout/CheckoutAddressTypeValidator.php +++ b/src/Validator/Constraints/Checkout/CheckoutAddressTypeValidator.php @@ -43,7 +43,7 @@ public function __construct( $this->fraudSuspicionCommonModelConverter = $fraudSuspicionCommonModelConverter; } - public function validate($order, Constraint $constraint): void + public function validate(mixed $order, Constraint $constraint): void { Assert::isInstanceOf($order, OrderInterface::class); diff --git a/tests/Behat/Page/Admin/FraudSuspicion/CreatePage.php b/tests/Behat/Page/Admin/FraudSuspicion/CreatePage.php index e4970d73..80e8a4e3 100755 --- a/tests/Behat/Page/Admin/FraudSuspicion/CreatePage.php +++ b/tests/Behat/Page/Admin/FraudSuspicion/CreatePage.php @@ -40,7 +40,7 @@ public function selectCustomer(string $customerEmail): CreatePageInterface $dropdown = $this->getElement('customer_dropdown'); $dropdown->click(); - $dropdown->waitFor(1, function () use ($customerEmail) { + $dropdown->waitFor(5, function () use ($customerEmail) { return $this->hasElement('customer_dropdown_item', [ '%item%' => $customerEmail, ]);