From b62fc504420d637c6433670a2f67ec2a83709724 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Mon, 12 Sep 2022 16:50:17 +0200 Subject: [PATCH 1/3] [All] Refactor Code Styles --- composer.json | 16 +- ecs.php | 402 +++++++----------- src/AppKernel.php | 16 +- src/BehatKernel.php | 14 +- .../Behat/Context/Cli/InstallerContext.php | 21 +- .../Behat/Context/Domain/CartContext.php | 153 +++---- .../Context/Domain/CartPriceRuleContext.php | 17 +- .../CartPriceRuleVoucherCodeContext.php | 17 +- .../Behat/Context/Domain/CategoryContext.php | 21 +- .../Behat/Context/Domain/CountryContext.php | 41 +- .../Behat/Context/Domain/CurrencyContext.php | 40 +- .../Behat/Context/Domain/CustomerContext.php | 21 +- .../Context/Domain/CustomerGroupContext.php | 17 +- .../Context/Domain/ExchangeRateContext.php | 25 +- .../Behat/Context/Domain/FilterContext.php | 40 +- .../Context/Domain/IndexConditionContext.php | 19 +- .../Behat/Context/Domain/IndexContext.php | 36 +- .../Context/Domain/LinkGeneratorContext.php | 29 +- .../Behat/Context/Domain/MenuContext.php | 17 +- .../Context/Domain/NotificationContext.php | 21 +- .../Behat/Context/Domain/OrderContext.php | 69 +-- .../Context/Domain/PimcoreClassContext.php | 25 +- .../Behat/Context/Domain/PimcoreContext.php | 26 +- .../Behat/Context/Domain/ProductContext.php | 34 +- .../Domain/ProductPriceRuleContext.php | 23 +- .../ProductQuantityPriceRuleContext.php | 23 +- .../ProductSpecificPriceRuleContext.php | 23 +- .../Context/Domain/ProductUnitContext.php | 19 +- .../Context/Domain/RecycleBinContext.php | 17 +- .../Behat/Context/Domain/SEOContext.php | 24 +- .../Behat/Context/Domain/ShippingContext.php | 31 +- .../Behat/Context/Domain/StoreContext.php | 17 +- .../Behat/Context/Domain/TaxRateContext.php | 21 +- .../Context/Domain/TaxRuleGroupContext.php | 32 +- .../Behat/Context/Domain/ThemeContext.php | 17 +- .../Behat/Context/Domain/TrackingContext.php | 41 +- .../Behat/Context/Domain/VariantContext.php | 24 +- .../Context/Hook/CoreShopSetupContext.php | 23 +- .../Behat/Context/Hook/DoctrineORMContext.php | 17 +- .../Behat/Context/Hook/PimcoreDaoContext.php | 22 +- .../Context/Hook/PimcoreSetupContext.php | 17 +- .../Behat/Context/Setup/ActionFormTrait.php | 17 +- .../Behat/Context/Setup/AddressContext.php | 23 +- .../Context/Setup/BackendSecurityContext.php | 26 +- .../Behat/Context/Setup/CartContext.php | 29 +- .../Context/Setup/CartPriceRuleContext.php | 32 +- .../Setup/CartPriceRuleVoucherCodeContext.php | 23 +- .../Behat/Context/Setup/CategoryContext.php | 23 +- .../Context/Setup/ConditionFormTrait.php | 17 +- .../Context/Setup/ConfigurationContext.php | 17 +- .../Behat/Context/Setup/CountryContext.php | 29 +- .../Behat/Context/Setup/CurrencyContext.php | 26 +- .../Behat/Context/Setup/CustomerContext.php | 28 +- .../Context/Setup/CustomerGroupContext.php | 23 +- .../Context/Setup/ExchangeRateContext.php | 23 +- .../Behat/Context/Setup/FilterContext.php | 25 +- .../Context/Setup/FrontendSecurityContext.php | 26 +- .../Context/Setup/IndexConditionContext.php | 17 +- .../Behat/Context/Setup/IndexContext.php | 27 +- .../Behat/Context/Setup/LocaleContext.php | 17 +- .../Behat/Context/Setup/LogContext.php | 27 +- .../Context/Setup/ManufacturerContext.php | 23 +- .../Setup/OptimisticEntityLockContext.php | 17 +- .../Behat/Context/Setup/OrderContext.php | 24 +- .../Context/Setup/OrderInvoiceContext.php | 25 +- .../Context/Setup/OrderShipmentContext.php | 25 +- .../Behat/Context/Setup/PaymentContext.php | 26 +- .../Context/Setup/PimcoreClassContext.php | 27 +- .../Behat/Context/Setup/ProductContext.php | 58 +-- .../Context/Setup/ProductPriceRuleContext.php | 58 +-- .../Setup/ProductQuantityPriceRuleContext.php | 70 +-- .../Setup/ProductSpecificPriceRuleContext.php | 36 +- .../Context/Setup/ProductUnitContext.php | 24 +- .../Behat/Context/Setup/RecycleBinContext.php | 19 +- .../Behat/Context/Setup/ShippingContext.php | 40 +- .../Behat/Context/Setup/StoreContext.php | 29 +- .../Behat/Context/Setup/TaxRateContext.php | 24 +- .../Context/Setup/TaxRuleGroupContext.php | 25 +- .../Behat/Context/Setup/VariantContext.php | 29 +- .../Behat/Context/Setup/VersionContext.php | 17 +- .../Behat/Context/Setup/ZoneContext.php | 25 +- .../Context/Transform/AddressContext.php | 17 +- .../Behat/Context/Transform/CartContext.php | 24 +- .../Transform/CartPriceRuleContext.php | 23 +- .../Context/Transform/CategoryContext.php | 25 +- .../Context/Transform/CountryContext.php | 25 +- .../Context/Transform/CurrencyContext.php | 25 +- .../Context/Transform/CustomerContext.php | 23 +- .../Transform/CustomerGroupContext.php | 19 +- .../Behat/Context/Transform/FilterContext.php | 17 +- .../Transform/IndexConditionContext.php | 17 +- .../Behat/Context/Transform/IndexContext.php | 25 +- .../Context/Transform/ManufacturerContext.php | 25 +- .../Behat/Context/Transform/OrderContext.php | 17 +- .../Context/Transform/PaymentContext.php | 25 +- .../Context/Transform/PimcoreClassContext.php | 23 +- .../Context/Transform/ProductContext.php | 27 +- .../Transform/ProductPriceRuleContext.php | 23 +- .../ProductQuantityPriceRuleContext.php | 23 +- .../ProductSpecificPriceRuleContext.php | 23 +- .../Context/Transform/ProductUnitContext.php | 23 +- .../Transform/SharedStorageContext.php | 17 +- .../Context/Transform/ShippingContext.php | 26 +- .../Behat/Context/Transform/StoreContext.php | 19 +- .../Context/Transform/TaxRateContext.php | 19 +- .../Context/Transform/TaxRuleGroupContext.php | 25 +- .../Context/Transform/VariantContext.php | 29 +- .../Context/Transform/VersionContext.php | 17 +- .../Behat/Context/Transform/ZoneContext.php | 19 +- .../Context/Ui/Domain/PaymentController.php | 32 +- .../Behat/Context/Ui/Frontend/CartContext.php | 34 +- .../Context/Ui/Frontend/CheckoutContext.php | 22 +- .../Context/Ui/Frontend/CurrencyContext.php | 18 +- .../Ui/Frontend/CustomerProfileContext.php | 38 +- .../Context/Ui/Frontend/HomepageContext.php | 17 +- .../Context/Ui/Frontend/LoginContext.php | 25 +- .../Context/Ui/Frontend/ProductContext.php | 22 +- .../Ui/Frontend/RegistrationContext.php | 27 +- .../Context/Ui/Frontend/StoreContext.php | 18 +- .../Behat/Context/Ui/Frontend/UserContext.php | 17 +- .../Ui/Pimcore/CoreShop/CountryContext.php | 23 +- .../Ui/Pimcore/CoreShop/CurrencyContext.php | 17 +- .../Pimcore/CoreShop/ExchangeRateContext.php | 17 +- .../Ui/Pimcore/CoreShop/StateContext.php | 17 +- .../Ui/Pimcore/CoreShop/TaxRateContext.php | 17 +- .../Pimcore/CoreShop/TaxRuleGroupContext.php | 17 +- .../Ui/Pimcore/CoreShop/ZoneContext.php | 17 +- .../Behat/Context/Ui/Pimcore/LoginContext.php | 23 +- .../Behat/Context/Ui/Pimcore/MenuContext.php | 17 +- .../Behat/Context/Ui/Pimcore/PWAContext.php | 17 +- .../Behat/Element/AbstractElement.php | 19 +- .../Frontend/Account/RegisterElement.php | 17 +- .../Account/RegisterElementInterface.php | 17 +- .../Behat/Element/Pimcore/MenuElement.php | 17 +- .../Element/Pimcore/MenuElementInterface.php | 17 +- .../Behat/Model/Index/TestEnableIndex.php | 20 +- src/CoreShop/Behat/Model/Index/TestIndex.php | 19 +- .../Behat/Model/Index/TestIndexFields.php | 17 +- .../Behat/Model/Lock/OptimisticLock.php | 17 +- .../Page/Frontend/AbstractFrontendPage.php | 17 +- .../Frontend/Account/ChangePasswordPage.php | 17 +- .../Account/ChangePasswordPageInterface.php | 17 +- .../Frontend/Account/ChangeProfilePage.php | 17 +- .../Account/ChangeProfilePageInterface.php | 17 +- .../Behat/Page/Frontend/Account/LoginPage.php | 17 +- .../Frontend/Account/LoginPageInterface.php | 17 +- .../Page/Frontend/Account/ProfilePage.php | 17 +- .../Frontend/Account/ProfilePageInterface.php | 17 +- .../Page/Frontend/Account/RegisterPage.php | 17 +- .../Account/RegisterPageInterface.php | 17 +- .../Account/RequestPasswordResetPage.php | 17 +- .../RequestPasswordResetPageInterface.php | 17 +- src/CoreShop/Behat/Page/Frontend/CartPage.php | 21 +- .../Behat/Page/Frontend/CartPageInterface.php | 17 +- .../Page/Frontend/Checkout/AddressPage.php | 17 +- .../Checkout/AddressPageInterface.php | 17 +- .../Page/Frontend/Checkout/CustomerPage.php | 17 +- .../Checkout/CustomerPageInterface.php | 17 +- .../Page/Frontend/Checkout/PaymentPage.php | 17 +- .../Checkout/PaymentPageInterface.php | 17 +- .../Page/Frontend/Checkout/ShippingPage.php | 17 +- .../Checkout/ShippingPageInterface.php | 17 +- .../Page/Frontend/Checkout/SummaryPage.php | 17 +- .../Checkout/SummaryPageInterface.php | 17 +- .../Page/Frontend/Checkout/ThankYouPage.php | 17 +- .../Checkout/ThankYouPageInterface.php | 17 +- .../Page/Frontend/FrontendPageInterface.php | 17 +- src/CoreShop/Behat/Page/Frontend/HomePage.php | 19 +- .../Behat/Page/Frontend/HomePageInterface.php | 17 +- .../Behat/Page/Frontend/ProductPage.php | 27 +- .../Page/Frontend/ProductPageInterface.php | 18 +- .../Page/Frontend/SluggablePageTrait.php | 17 +- .../Pimcore/AbstractCoreShopResourcePage.php | 17 +- .../Page/Pimcore/AbstractPimcorePage.php | 23 +- .../Page/Pimcore/AbstractPimcoreTabPage.php | 23 +- .../Page/Pimcore/CoreShop/CountryPage.php | 17 +- .../Pimcore/CoreShop/CountryPageInterface.php | 17 +- .../Page/Pimcore/CoreShop/CurrencyPage.php | 17 +- .../CoreShop/CurrencyPageInterface.php | 17 +- .../Pimcore/CoreShop/ExchangeRatePage.php | 17 +- .../CoreShop/ExchangeRatePageInterface.php | 17 +- .../Behat/Page/Pimcore/CoreShop/StatePage.php | 17 +- .../Pimcore/CoreShop/StatePageInterface.php | 17 +- .../Page/Pimcore/CoreShop/TaxRatePage.php | 17 +- .../Pimcore/CoreShop/TaxRatePageInterface.php | 17 +- .../Pimcore/CoreShop/TaxRuleGroupPage.php | 17 +- .../CoreShop/TaxRuleGroupPageInterface.php | 17 +- .../Behat/Page/Pimcore/CoreShop/ZonePage.php | 17 +- .../Pimcore/CoreShop/ZonePageInterface.php | 17 +- .../Pimcore/CoreShopResourcePageInterface.php | 17 +- src/CoreShop/Behat/Page/Pimcore/LoginPage.php | 17 +- .../Behat/Page/Pimcore/LoginPageInterface.php | 17 +- src/CoreShop/Behat/Page/Pimcore/PWAPage.php | 21 +- .../Behat/Page/Pimcore/PWAPageInterface.php | 17 +- .../Page/Pimcore/PimcorePageInterface.php | 17 +- .../Page/Pimcore/PimcoreTabPageInterface.php | 17 +- src/CoreShop/Behat/Service/ClassStorage.php | 17 +- .../Behat/Service/ClassStorageInterface.php | 17 +- .../CompilerPass/MonologChannelLoggerPass.php | 17 +- ...figurationBasedDisplayFractionProvider.php | 17 +- src/CoreShop/Behat/Service/CookieSetter.php | 23 +- .../Behat/Service/CookieSetterInterface.php | 17 +- .../CustomRelationalIndexInterpreter.php | 21 +- ...tificationExpectationMismatchException.php | 21 +- .../Service/Index/IndexColumnExtension.php | 17 +- .../Index/RelationalIndexExtension.php | 17 +- .../Behat/Service/JavascriptHelper.php | 17 +- .../Behat/Service/NotificationAccessor.php | 17 +- .../Service/NotificationAccessorInterface.php | 17 +- .../Behat/Service/NotificationChecker.php | 17 +- .../Service/NotificationCheckerInterface.php | 17 +- .../Behat/Service/NotificationType.php | 17 +- .../Concurrency/Action/CaptureAction.php | 17 +- .../Action/ConvertPaymentAction.php | 19 +- .../Payum/Concurrency/Action/NotifyAction.php | 17 +- .../Payum/Concurrency/Action/StatusAction.php | 17 +- .../Concurrency/ConcurrencyGatewayFactory.php | 17 +- .../Behat/Service/PimcoreCookieSetter.php | 17 +- .../Behat/Service/PimcoreSecurityService.php | 17 +- .../PimcoreSecurityServiceInterface.php | 17 +- .../Service/Resolver/CurrentPageResolver.php | 23 +- .../Resolver/CurrentPageResolverInterface.php | 17 +- .../Behat/Service/SecurityService.php | 19 +- .../Service/SecurityServiceInterface.php | 17 +- src/CoreShop/Behat/Service/Setup.php | 17 +- src/CoreShop/Behat/Service/SharedStorage.php | 17 +- .../Behat/Service/SharedStorageInterface.php | 17 +- .../Behat/Service/StoreContextSetter.php | 19 +- .../Service/StoreContextSetterInterface.php | 17 +- .../Behat/Service/Tracking/ConfigResolver.php | 17 +- .../Collector/CountryCollector.php | 19 +- .../Controller/CountryController.php | 17 +- .../CoreExtension/AddressIdentifier.php | 17 +- .../AddressBundle/CoreExtension/Country.php | 17 +- .../CoreExtension/CountryMultiselect.php | 17 +- .../AddressBundle/CoreExtension/State.php | 17 +- .../AddressBundle/CoreShopAddressBundle.php | 17 +- .../Compiler/CompositeCountryContextPass.php | 19 +- .../Compiler/CompositeRequestResolverPass.php | 19 +- .../DependencyInjection/Configuration.php | 26 +- .../CoreShopAddressExtension.php | 23 +- .../ORM/AddressIdentifierRepository.php | 20 +- .../Doctrine/ORM/CountryRepository.php | 23 +- .../Form/Type/AddressIdentifierChoiceType.php | 20 +- .../Form/Type/AddressIdentifierType.php | 20 +- .../AddressBundle/Form/Type/AddressType.php | 20 +- .../Form/Type/CountryChoiceType.php | 20 +- .../Form/Type/CountryTranslationType.php | 20 +- .../AddressBundle/Form/Type/CountryType.php | 20 +- .../Form/Type/SalutationChoiceType.php | 20 +- .../Form/Type/StateChoiceType.php | 20 +- .../Form/Type/StateTranslationType.php | 20 +- .../AddressBundle/Form/Type/StateType.php | 20 +- .../Form/Type/ZoneChoiceType.php | 20 +- .../AddressBundle/Form/Type/ZoneType.php | 20 +- .../Resources/public/pimcore/css/address.css | 13 +- .../Twig/FormatAddressExtension.php | 17 +- .../Constraints/ValidAddressIdentifier.php | 17 +- .../ValidAddressIdentifierValidator.php | 20 +- .../Controller/ConfigurationController.php | 17 +- .../CoreShopConfigurationBundle.php | 17 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopConfigurationExtension.php | 17 +- .../Doctrine/ORM/ConfigurationRepository.php | 20 +- .../Form/Type/ConfigurationCollectionType.php | 20 +- .../Form/Type/ConfigurationType.php | 20 +- .../Serialization/ObjectHandler.php | 17 +- .../Bundle/CoreBundle/Application/Version.php | 19 +- .../Checkout/Step/AddressCheckoutStep.php | 29 +- .../Step/CustomerAddressCheckoutStep.php | 29 +- .../Checkout/Step/CustomerCheckoutStep.php | 24 +- .../Step/GuestAddressCheckoutStep.php | 27 +- .../Checkout/Step/PaymentCheckoutStep.php | 23 +- .../Checkout/Step/ShippingCheckoutStep.php | 28 +- .../Checkout/Step/SummaryCheckoutStep.php | 23 +- .../Collector/CurrencyCollector.php | 19 +- .../Command/AbstractInstallCommand.php | 26 +- .../CoreBundle/Command/InstallCommand.php | 36 +- .../Command/InstallDatabaseCommand.php | 24 +- .../CoreBundle/Command/InstallDemoCommand.php | 20 +- .../Command/InstallFixturesCommand.php | 20 +- .../Command/InstallFoldersCommand.php | 24 +- .../Command/InstallResourcesCommand.php | 20 +- .../CoreBundle/Command/MigrateCommand.php | 20 +- .../Command/MigrationGenerateCommand.php | 17 +- .../Controller/ConfigurationController.php | 17 +- .../CustomerTransformerController.php | 19 +- .../CoreBundle/Controller/OrderController.php | 17 +- .../Controller/OrderCreationController.php | 19 +- .../Controller/PortletsController.php | 19 +- .../Controller/ProductController.php | 17 +- .../Controller/ProductPreviewController.php | 17 +- .../ProductValidationController.php | 19 +- ...ProductVariantUnitSolidifierController.php | 21 +- .../Controller/ReportsController.php | 19 +- .../Controller/SettingsController.php | 17 +- .../CoreBundle/CoreExtension/StoreValues.php | 45 +- .../Bundle/CoreBundle/CoreShopCoreBundle.php | 17 +- .../CustomerAlreadyExistsException.php | 17 +- .../Customer/CustomerLoginService.php | 17 +- .../CustomerLoginServiceInterface.php | 17 +- .../CoreBundle/Customer/CustomerManager.php | 30 +- .../Customer/CustomerManagerInterface.php | 17 +- .../RegisterIndexProductExtensionPass.php | 17 +- .../Compiler/RegisterPortletsPass.php | 19 +- .../Compiler/RegisterReportsPass.php | 19 +- .../DependencyInjection/Configuration.php | 29 +- .../CoreShopCoreExtension.php | 25 +- .../Doctrine/ORM/CarrierRepository.php | 20 +- .../Doctrine/ORM/ConfigurationRepository.php | 20 +- .../Doctrine/ORM/CountryRepository.php | 20 +- .../Doctrine/ORM/CurrencyRepository.php | 20 +- .../ORM/PaymentProviderRepository.php | 20 +- .../ORM/ProductStoreValuesRepository.php | 23 +- .../Doctrine/ORM/TaxRuleRepository.php | 22 +- .../Event/CustomerRegistrationEvent.php | 23 +- .../RequestNewsletterConfirmationEvent.php | 23 +- .../EventListener/AdminJavascriptListener.php | 17 +- .../EventListener/CartBlamerListener.php | 24 +- .../CustomerCompanyRelationListener.php | 17 +- .../EventListener/CustomerLoginListener.php | 17 +- .../CustomerNewsletterConfirmListener.php | 28 +- .../CustomerOrderDeletionListener.php | 17 +- .../CustomerSecurityValidationListener.php | 24 +- .../AbstractNotificationRuleListener.php | 23 +- .../NotificationRules/CustomerListener.php | 27 +- .../OrderCommentsListener.php | 17 +- .../OrderDocumentWorkflowListener.php | 17 +- .../OrderWorkflowListener.php | 17 +- .../PaymentWorkflowListener.php | 17 +- ...rderDocumentWkhtmlPrintOptionsListener.php | 17 +- .../Order/OrderMailNoteEventListener.php | 19 +- .../PriceRuleUpdateEventListener.php | 17 +- .../ProductAvailabilityEventListener.php | 25 +- .../ProductStoreValuesAdminGetListener.php | 17 +- .../ProductUpdateEventListener.php | 17 +- .../QuantityRangeUnitValidationListener.php | 17 +- .../EventListener/RequestCartAvailability.php | 24 +- .../RequestCartRecalculation.php | 25 +- .../EventListener/ShopUserLogoutHandler.php | 23 +- .../Application/AddressIdentifierFixture.php | 17 +- .../Data/Application/ConfigurationFixture.php | 17 +- .../Data/Application/CountryFixture.php | 17 +- .../Data/Application/CurrencyFixture.php | 17 +- .../Application/NotificationRulesFixture.php | 17 +- .../Data/Application/StoreFixture.php | 17 +- .../Fixtures/Data/Application/ZoneFixture.php | 17 +- .../Data/Demo/AbstractProductFixture.php | 27 +- .../Data/Demo/AttributeGroupsFixture.php | 30 +- .../Fixtures/Data/Demo/CarrierFixture.php | 17 +- .../Fixtures/Data/Demo/CategoryFixture.php | 17 +- .../Data/Demo/PaymentProviderFixture.php | 17 +- .../Fixtures/Data/Demo/ProductFixture.php | 17 +- .../Fixtures/Data/Demo/ProductUnitFixture.php | 17 +- .../Demo/ProductWithAttributesFixture.php | 66 ++- .../Data/Demo/ProductWithUnitFixture.php | 19 +- .../Data/Demo/ShippingRuleFixture.php | 17 +- .../Data/Demo/ShippingRuleGroupFixture.php | 17 +- .../Fixtures/Data/Demo/TaxRateFixture.php | 17 +- .../Data/Demo/TaxRuleGroupFixture.php | 17 +- .../Form/DataMapper/CustomerDataMapper.php | 17 +- .../CustomerRegistrationFormSubscriber.php | 17 +- .../Form/Extension/AddToCartTypeExtension.php | 17 +- .../Form/Extension/AddressTypeExtension.php | 17 +- .../Form/Extension/CarrierTypeExtension.php | 17 +- .../CartCreationCartItemTypeExtension.php | 17 +- .../Extension/CartCreationTypeExtension.php | 17 +- .../Form/Extension/CartItemTypeExtension.php | 22 +- .../Form/Extension/CartTypeExtension.php | 20 +- .../Form/Extension/CountryTypeExtension.php | 17 +- .../Form/Extension/CustomerTypeExtension.php | 17 +- .../OrderShipmentCreationTypeExtension.php | 17 +- .../PaymentProviderTypeExtension.php | 17 +- ...ctQuantityRangeCollectionTypeExtension.php | 23 +- .../ProductQuantityRangeTypeExtension.php | 24 +- .../Form/Extension/StoreTypeExtension.php | 17 +- .../Form/Extension/TaxRuleTypeExtension.php | 20 +- .../Form/Type/AddressChoiceType.php | 28 +- .../Form/Type/Checkout/AddressType.php | 24 +- .../Form/Type/Checkout/CarrierChoiceType.php | 24 +- .../Form/Type/Checkout/CarrierType.php | 20 +- .../Form/Type/Checkout/GuestAddressType.php | 22 +- .../Form/Type/Checkout/PaymentType.php | 24 +- .../Form/Type/Checkout/SummaryType.php | 20 +- .../Form/Type/CustomerRegistrationType.php | 22 +- .../Form/Type/GuestRegistrationType.php | 22 +- .../Action/OrderMailConfigurationType.php | 20 +- .../Action/StoreMailConfigurationType.php | 20 +- .../StoreOrderMailConfigurationType.php | 20 +- .../BackendCreatedConfigurationType.php | 20 +- .../InvoiceStateConfigurationType.php | 20 +- .../OrderInvoiceStateConfigurationType.php | 20 +- .../OrderPaymentStateConfigurationType.php | 20 +- .../OrderSaleStateConfigurationType.php | 20 +- .../OrderShippingStateConfigurationType.php | 20 +- .../Condition/OrderStateConfigurationType.php | 20 +- .../PaymentStateConfigurationType.php | 20 +- .../Condition/QuoteStateConfigurationType.php | 17 +- .../ShipmentStateConfigurationType.php | 20 +- .../StateTransitionConfigurationType.php | 20 +- .../Condition/StoresConfigurationType.php | 20 +- .../Condition/UserTypeConfigurationType.php | 20 +- .../Form/Type/Order/PaymentType.php | 17 +- .../ProductStoreValuesSelectionType.php | 22 +- .../Type/Product/ProductStoreValuesType.php | 20 +- .../Condition/QuantityConfigurationType.php | 20 +- .../Action/FreeShippingConfigurationType.php | 17 +- .../Action/GiftProductConfigurationType.php | 17 +- .../Condition/CarriersConfigurationType.php | 20 +- .../Condition/CategoriesConfigurationType.php | 20 +- .../Condition/CommentConfigurationType.php | 20 +- .../Condition/CountriesConfigurationType.php | 20 +- .../Condition/CurrenciesConfigurationType.php | 20 +- .../CustomerGroupsConfigurationType.php | 20 +- .../Condition/CustomersConfigurationType.php | 20 +- .../Condition/ProductsConfigurationType.php | 20 +- .../Condition/StoresConfigurationType.php | 20 +- .../Condition/TimespanConfigurationType.php | 20 +- .../Rule/Condition/ZonesConfigurationType.php | 20 +- .../AdditionAmountActionConfigurationType.php | 22 +- .../DiscountAmountActionConfigurationType.php | 22 +- .../Action/PriceActionConfigurationType.php | 22 +- .../Form/Type/UserRegistrationType.php | 20 +- src/CoreShop/Bundle/CoreBundle/Installer.php | 17 +- .../Checker/CommandDirectoryChecker.php | 21 +- .../Installer/Executor/CommandExecutor.php | 26 +- .../Executor/FolderInstallerProvider.php | 17 +- .../DatabaseSetupCommandsProvider.php | 17 +- ...DatabaseSetupCommandsProviderInterface.php | 17 +- .../Maintenance/OrderExpireTask.php | 26 +- .../Maintenance/RuleAvailabilityTask.php | 23 +- .../CoreBundle/Menu/MainMenuBuilder.php | 128 ++++-- .../Migrations/Version20190605141526.php | 17 +- .../Migrations/Version20191122074930.php | 17 +- .../Migrations/Version20200206155318.php | 21 +- .../Migrations/Version20200414153349.php | 17 +- .../Migrations/Version20200415151505.php | 17 +- .../Migrations/Version20200415152315.php | 31 +- .../Migrations/Version20200415152607.php | 17 +- .../Migrations/Version20200415152858.php | 17 +- .../Migrations/Version20200415153309.php | 17 +- .../Migrations/Version20200415153349.php | 17 +- .../Migrations/Version20200415153636.php | 17 +- .../Migrations/Version20200415153637.php | 14 + .../Migrations/Version20200415153638.php | 17 +- .../Migrations/Version20200415154821.php | 17 +- .../Migrations/Version20200415160423.php | 17 +- .../Migrations/Version20200415160746.php | 17 +- .../Migrations/Version20200415160854.php | 17 +- .../Migrations/Version20200415161210.php | 17 +- .../Migrations/Version20200421105731.php | 17 +- .../Migrations/Version20200617120130.php | 17 +- .../Migrations/Version20210511074115.php | 17 +- .../Migrations/Version20210727061308.php | 14 + .../Migrations/Version20210727061604.php | 14 + .../Migrations/Version20210924090831.php | 14 + .../Migrations/Version20220117153741.php | 15 +- .../Migrations/Version20220315131030.php | 14 + .../Migrations/Version20220323072817.php | 15 +- .../Migrations/Version20220324073343.php | 16 +- .../Migrations/Version20220330151612.php | 61 +-- .../Migrations/Version20220330153600.php | 61 +-- .../Migrations/Version20220414125342.php | 175 ++++---- .../Migrations/Version20220503143220.php | 14 + .../Migrations/Version20220503144151.php | 218 +++++----- .../Migrations/Version20220509091354.php | 14 + .../Migrations/Version20220817144912.php | 17 +- .../Migrations/Version20220817144952.php | 100 +++-- .../Migrations/Version20220824065814.php | 15 +- .../CoreBundle/Order/OrderMailProcessor.php | 28 +- .../Operator/Factory/StorePriceFactory.php | 23 +- .../GridColumnConfig/Operator/StorePrice.php | 19 +- .../LinkGenerator/DataObjectLinkGenerator.php | 24 +- .../Pimcore/Repository/CategoryRepository.php | 26 +- .../Pimcore/Repository/CustomerRepository.php | 17 +- .../Pimcore/Repository/ProductRepository.php | 20 +- .../Pimcore/Repository/WishlistRepository.php | 22 +- .../Report/AbandonedCartsReport.php | 28 +- .../CoreBundle/Report/CarriersReport.php | 27 +- .../Bundle/CoreBundle/Report/CartsReport.php | 24 +- .../CoreBundle/Report/CategoriesReport.php | 45 +- .../CoreBundle/Report/CustomersReport.php | 32 +- .../CoreBundle/Report/ManufacturerReport.php | 45 +- .../Report/PaymentProvidersReport.php | 27 +- .../CoreBundle/Report/ProductsReport.php | 45 +- .../Bundle/CoreBundle/Report/SalesReport.php | 28 +- .../CoreBundle/Report/VouchersReport.php | 30 +- .../Resources/public/pimcore/css/core.css | 14 +- .../coreExtension/data/coreShopStoreValues.js | 13 +- .../coreExtension/tags/coreShopStoreValues.js | 13 +- .../pimcore/js/product/storevalues/builder.js | 13 +- .../js/product/storevalues/items/price.js | 13 +- .../js/product/storevalues/items/unitPrice.js | 13 +- .../pimcore/js/product/units/builder.js | 13 +- .../CoreBundle/Security/AccessVoter.php | 21 +- .../Security/ObjectUserProvider.php | 23 +- .../CoreBundle/Storage/CookieStorage.php | 19 +- .../CoreBundle/Storage/SessionStorage.php | 17 +- .../Test/Service/NotificationRuleListener.php | 17 +- .../NotificationRuleListenerInterface.php | 17 +- .../CoreBundle/Twig/AddToCartExtension.php | 19 +- .../Twig/AddressAllocatorExtension.php | 17 +- .../Twig/CheckoutIdentifierExtension.php | 39 +- .../Twig/ConfigurationExtension.php | 17 +- .../CoreBundle/Twig/ProductPriceExtension.php | 17 +- ...tQuantityPriceRuleRangesPriceExtension.php | 28 +- .../CoreBundle/Twig/ProductTaxExtension.php | 24 +- .../Twig/TaxationDisplayProviderExtension.php | 17 +- .../Twig/ValidPriceRulesExtension.php | 17 +- .../Constraints/AddToCartAvailability.php | 17 +- .../AddToCartAvailabilityValidator.php | 27 +- .../Constraints/AddToCartMaximumQuantity.php | 17 +- .../AddToCartMaximumQuantityValidator.php | 25 +- .../Constraints/AddToCartMinimumQuantity.php | 17 +- .../AddToCartMinimumQuantityValidator.php | 25 +- .../Constraints/CartMaximumQuantity.php | 17 +- .../CartMaximumQuantityValidator.php | 21 +- .../Constraints/CartMinimumQuantity.php | 17 +- .../CartMinimumQuantityValidator.php | 21 +- .../Constraints/CartStockAvailability.php | 17 +- .../CartStockAvailabilityValidator.php | 21 +- .../QuantityRangePriceCurrencyAware.php | 17 +- ...antityRangePriceCurrencyAwareValidator.php | 20 +- .../Validator/Constraints/RegisteredUser.php | 17 +- .../Constraints/RegisteredUserValidator.php | 17 +- .../Validator/Constraints/UniqueCustomer.php | 17 +- .../Constraints/UniqueCustomerValidator.php | 23 +- .../Validator/QuantityValidatorService.php | 17 +- .../Controller/CurrencyController.php | 17 +- .../Controller/ExchangeRateController.php | 17 +- .../CurrencyBundle/CoreExtension/Currency.php | 17 +- .../CoreExtension/CurrencyMultiselect.php | 17 +- .../CoreExtension/MoneyCurrency.php | 33 +- .../CurrencyBundle/CoreShopCurrencyBundle.php | 17 +- .../DataHub/QueryType/MoneyCurrency.php | 26 +- .../Compiler/CompositeCurrencyContextPass.php | 19 +- .../DependencyInjection/Configuration.php | 26 +- .../CoreShopCurrencyExtension.php | 20 +- .../Doctrine/ORM/CurrencyRepository.php | 23 +- .../Doctrine/ORM/ExchangeRateRepository.php | 22 +- .../Form/Type/CurrencyChoiceType.php | 20 +- .../CurrencyBundle/Form/Type/CurrencyType.php | 20 +- .../Form/Type/ExchangeRateType.php | 20 +- .../Resources/public/pimcore/css/currency.css | 13 +- .../tags/coreShopMoneyCurrency.js | 13 +- .../Twig/ConvertCurrencyExtension.php | 17 +- .../CurrencyBundle/Twig/CurrencyExtension.php | 17 +- .../Twig/DisplayFractionExtension.php | 17 +- .../Provider/RoleOptionsProvider.php | 17 +- .../CustomerBundle/CoreShopCustomerBundle.php | 17 +- .../Compiler/CompositeCustomerContextPass.php | 19 +- .../Compiler/CompositeRequestResolverPass.php | 19 +- .../DependencyInjection/Configuration.php | 29 +- .../CoreShopCustomerExtension.php | 23 +- .../Form/Type/ChangePasswordType.php | 20 +- .../Form/Type/CustomerLoginType.php | 20 +- .../Form/Type/CustomerSelectionType.php | 17 +- .../CustomerBundle/Form/Type/CustomerType.php | 30 +- .../Pimcore/Repository/CompanyRepository.php | 17 +- .../Pimcore/Repository/CustomerRepository.php | 17 +- .../Resources/public/pimcore/css/customer.css | 13 +- .../Command/LoadDataFixturesCommand.php | 46 +- .../FixtureBundle/CoreShopFixtureBundle.php | 17 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopFixtureExtension.php | 17 +- .../FixtureBundle/Event/DataFixturesEvent.php | 24 +- .../FixtureBundle/Event/FixturesEvents.php | 17 +- .../AbstractEntityReferenceFixture.php | 20 +- .../Fixture/DataFixturesExecutor.php | 23 +- .../Fixture/DataFixturesExecutorInterface.php | 17 +- .../LoadedFixtureVersionAwareInterface.php | 17 +- .../Fixture/Loader/DataFixturesLoader.php | 23 +- .../Fixture/Sorter/DataFixturesSorter.php | 35 +- .../Fixture/UpdateDataFixturesFixture.php | 23 +- .../Fixture/VersionedFixtureInterface.php | 17 +- .../FixtureBundle/Model/DataFixture.php | 17 +- .../Model/DataFixtureInterface.php | 17 +- .../Repository/DataFixtureRepository.php | 23 +- .../DataFixtureRepositoryInterface.php | 17 +- .../Controller/CartController.php | 32 +- .../Controller/CategoryController.php | 35 +- .../Controller/CheckoutController.php | 18 +- .../Controller/CurrencyController.php | 17 +- .../Controller/CustomerController.php | 24 +- .../Controller/FrontendController.php | 17 +- .../Controller/IndexController.php | 17 +- .../Controller/MailController.php | 17 +- .../Controller/OrderController.php | 19 +- .../Controller/ProductController.php | 17 +- .../Controller/QuoteController.php | 17 +- .../Controller/RegisterController.php | 17 +- .../Controller/SearchController.php | 19 +- .../Controller/SecurityController.php | 24 +- .../FrontendBundle/CoreShopFrontendBundle.php | 17 +- .../RegisterFrontendControllerPass.php | 21 +- .../DependencyInjection/Configuration.php | 29 +- .../CoreShopFrontendExtension.php | 17 +- .../FrontendBundle/Form/Type/SearchType.php | 20 +- .../Resources/public/static/css/mail.css | 14 +- .../Resources/public/static/css/shop.css | 13 +- .../TemplateConfigurator.php | 23 +- .../TemplateConfiguratorInterface.php | 17 +- .../Twig/LocaleSwitcherExtension.php | 22 +- .../Twig/MergeRecursiveExtension.php | 19 +- .../Twig/TestFormAttributeExtension.php | 21 +- .../Twig/TestHtmlAttributeExtension.php | 21 +- .../IndexBundle/Command/IndexCommand.php | 31 +- .../Mysql/AbstractMysqlDynamicRenderer.php | 17 +- .../Condition/Mysql/CompareRenderer.php | 17 +- .../Condition/Mysql/ConcatRenderer.php | 23 +- .../Condition/Mysql/InRenderer.php | 21 +- .../Condition/Mysql/IsNullRenderer.php | 17 +- .../Condition/Mysql/IsRenderer.php | 17 +- .../Condition/Mysql/LikeRenderer.php | 19 +- .../Condition/Mysql/RangeRenderer.php | 17 +- .../Controller/FilterController.php | 19 +- .../Controller/IndexController.php | 23 +- .../IndexBundle/CoreExtension/Filter.php | 17 +- .../IndexBundle/CoreShopIndexBundle.php | 17 +- .../Compiler/RegisterColumnTypePass.php | 19 +- .../RegisterConditionRendererTypesPass.php | 19 +- .../Compiler/RegisterExtensionsPass.php | 17 +- .../RegisterFilterConditionTypesPass.php | 19 +- .../RegisterFilterPreConditionTypesPass.php | 19 +- .../RegisterFilterUserConditionTypesPass.php | 19 +- .../Compiler/RegisterGetterPass.php | 19 +- .../Compiler/RegisterIndexWorkerPass.php | 19 +- .../Compiler/RegisterInterpreterPass.php | 19 +- .../RegisterOrderRendererTypesPass.php | 19 +- .../DependencyInjection/Configuration.php | 26 +- .../CoreShopIndexExtension.php | 44 +- .../EventListener/AdminJavascriptListener.php | 17 +- .../EventListener/CreateIndexListener.php | 17 +- .../EventListener/DeleteIndexListener.php | 17 +- .../EventListener/IndexObjectListener.php | 17 +- .../EventListener/UpdateIndexListener.php | 17 +- .../MysqlIndexQueryExtensionInterface.php | 17 +- .../Factory/FilteredListingFactory.php | 17 +- .../IndexBundle/Factory/ListingFactory.php | 17 +- .../Form/DataMapper/ConditionsFormMapper.php | 17 +- ...ractConfigurableIndexColumnElementType.php | 30 +- ...IndexColumnTypeClassificationStoreType.php | 20 +- .../IndexColumnTypeFieldCollectionType.php | 20 +- .../IndexColumnTypeLocalizedFieldsType.php | 17 +- .../Column/IndexColumnTypeObjectBrickType.php | 20 +- .../Type/Column/IndexColumnTypeObjectType.php | 17 +- .../Type/Column/IndexColumnTypeSystemType.php | 17 +- .../AbstractConfigurationCollectionType.php | 21 +- .../Form/Type/EmptyConfigurationFormType.php | 17 +- .../Filter/FilterConditionBooleanType.php | 20 +- ...FilterConditionCategoryMultiSelectType.php | 20 +- .../FilterConditionCategorySelectType.php | 20 +- .../Filter/FilterConditionMultiselectType.php | 20 +- .../Type/Filter/FilterConditionRangeType.php | 20 +- .../Type/Filter/FilterConditionSearchType.php | 23 +- .../Type/Filter/FilterConditionSelectType.php | 20 +- .../Filter/FilterPreConditionNestedType.php | 20 +- .../Filter/FilterUserConditionNestedType.php | 20 +- .../Form/Type/FilterConditionChoiceType.php | 17 +- .../Form/Type/FilterConditionType.php | 34 +- .../Type/FilterPreConditionChoiceType.php | 17 +- .../Type/FilterPreConditionCollectionType.php | 17 +- .../Form/Type/FilterPreConditionType.php | 20 +- .../IndexBundle/Form/Type/FilterType.php | 24 +- .../Type/FilterUserConditionChoiceType.php | 17 +- .../FilterUserConditionCollectionType.php | 17 +- .../Form/Type/FilterUserConditionType.php | 20 +- .../Form/Type/Getter/BrickGetterFormType.php | 20 +- .../ClassificationStoreGetterFormType.php | 20 +- .../Getter/FieldCollectionGetterFormType.php | 20 +- .../IndexBundle/Form/Type/IndexChoiceType.php | 20 +- .../Form/Type/IndexColumnChoiceType.php | 17 +- .../Form/Type/IndexColumnCollectionType.php | 17 +- .../Form/Type/IndexColumnGetterChoiceType.php | 17 +- .../Type/IndexColumnInterpreterChoiceType.php | 17 +- .../IndexBundle/Form/Type/IndexColumnType.php | 35 +- .../IndexBundle/Form/Type/IndexType.php | 30 +- .../Form/Type/IndexWorkerChoiceType.php | 17 +- .../ExpressionInterpreterFormType.php | 20 +- .../Interpreter/InterpreterCollectionType.php | 21 +- .../Form/Type/Interpreter/InterpreterType.php | 26 +- .../Interpreter/IteratorInterpreterType.php | 20 +- .../Interpreter/NestedInterpreterType.php | 20 +- .../ObjectPropertyInterpreterFormType.php | 20 +- .../Type/Worker/MysqlWorkerTableIndexType.php | 20 +- .../Form/Type/Worker/MysqlWorkerType.php | 20 +- src/CoreShop/Bundle/IndexBundle/Installer.php | 21 +- .../IndexBundle/Menu/IndexMenuBuilder.php | 23 +- .../Migrations/Version20200224161101.php | 17 +- .../Migrations/Version20220121154623.php | 17 +- .../Mysql/AbstractMysqlDynamicRenderer.php | 17 +- .../Order/Mysql/SimpleOrderRenderer.php | 17 +- .../Form/Type/CoreShopIndexProcessType.php | 17 +- .../ProcessManager/IndexListener.php | 27 +- .../ProcessManager/IndexProcess.php | 17 +- .../Resources/public/pimcore/css/index.css | 13 +- .../IndexBundle/Worker/AbstractListing.php | 23 +- .../IndexBundle/Worker/AbstractWorker.php | 29 +- .../Bundle/IndexBundle/Worker/MysqlWorker.php | 29 +- .../Worker/MysqlWorker/Listing.php | 28 +- .../Worker/MysqlWorker/Listing/Dao.php | 25 +- .../Worker/MysqlWorker/TableIndex.php | 17 +- .../CoreShopInventoryBundle.php | 17 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopInventoryExtension.php | 17 +- .../Twig/InventoryExtension.php | 17 +- .../Validator/Constraints/InStock.php | 17 +- .../Constraints/InStockValidator.php | 19 +- .../LocaleBundle/CoreShopLocaleBundle.php | 17 +- .../Compiler/CompositeLocaleContextPass.php | 19 +- .../CoreShopLocaleExtension.php | 20 +- .../Form/Type/LocaleChoiceType.php | 20 +- src/CoreShop/Bundle/MenuBundle/Builder.php | 24 +- .../Builder/MenuBuilderInterface.php | 17 +- .../MenuBundle/Controller/MenuController.php | 17 +- .../Bundle/MenuBundle/CoreShopMenuBundle.php | 17 +- .../CompilerPass/MenuBuilderPass.php | 21 +- .../CoreShopMenuExtension.php | 20 +- .../EventListener/PimcoreAdminListener.php | 27 +- .../Bundle/MenuBundle/Guard/PimcoreGuard.php | 19 +- .../MenuBundle/Renderer/JsonRenderer.php | 23 +- .../MoneyBundle/CoreExtension/Money.php | 53 ++- .../MoneyBundle/CoreShopMoneyBundle.php | 17 +- .../MoneyBundle/DataHub/QueryType/Money.php | 19 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopMoneyExtension.php | 17 +- .../Transformer/MoneyToIntegerTransformer.php | 19 +- .../MoneyBundle/Form/Type/MoneyType.php | 19 +- .../MoneyBundle/Formatter/MoneyFormatter.php | 19 +- .../Resources/public/pimcore/css/money.css | 13 +- .../js/coreExtension/data/coreShopMoney.js | 13 +- .../js/coreExtension/tags/coreShopMoney.js | 13 +- .../MoneyBundle/Twig/FormatMoneyExtension.php | 17 +- .../Controller/NotificationRuleController.php | 17 +- .../CoreShopNotificationBundle.php | 17 +- .../Compiler/AbstractNotificationRulePass.php | 30 +- .../Compiler/NotificationRuleActionPass.php | 19 +- .../NotificationRuleConditionPass.php | 19 +- .../DependencyInjection/Configuration.php | 23 +- .../CoreShopNotificationExtension.php | 17 +- .../ORM/NotificationRuleRepository.php | 20 +- .../NotificationRuleEventListener.php | 17 +- .../Bundle/NotificationBundle/Events.php | 17 +- .../Type/NotificationRuleActionChoiceType.php | 17 +- .../NotificationRuleActionCollectionType.php | 17 +- .../Form/Type/NotificationRuleActionType.php | 20 +- .../NotificationRuleConditionChoiceType.php | 17 +- ...otificationRuleConditionCollectionType.php | 17 +- .../Type/NotificationRuleConditionType.php | 20 +- .../Form/Type/NotificationRuleType.php | 20 +- .../Type/NotificationRuleTypeChoiceType.php | 17 +- .../Action/MailActionConfigurationType.php | 20 +- .../Processor/EventedRuleProcessor.php | 23 +- .../public/pimcore/css/notification.css | 13 +- .../CoreShopOptimisticEntityLockBundle.php | 17 +- .../CoreShopOptimisticEntityLockExtension.php | 17 +- .../EventListener/LockListener.php | 27 +- .../Exception/OptimisticLockException.php | 25 +- .../Manager/EntityLockManager.php | 17 +- .../Manager/EntityLockManagerInterface.php | 17 +- .../Model/OptimisticLockedInterface.php | 17 +- .../OrderBundle/Collector/CartCollector.php | 19 +- .../OrderBundle/Command/CartExpireCommand.php | 35 +- .../Command/OrderExpireCommand.php | 30 +- .../Controller/AddressCreationController.php | 23 +- .../Controller/CartPriceRuleController.php | 27 +- .../Controller/CustomerCreationController.php | 29 +- .../Controller/OrderCommentController.php | 19 +- .../Controller/OrderController.php | 47 +- .../Controller/OrderCreationController.php | 27 +- .../OrderDocumentPrintController.php | 17 +- .../Controller/OrderEditController.php | 43 +- .../Controller/OrderInvoiceController.php | 21 +- .../Controller/OrderPaymentController.php | 21 +- .../Controller/OrderShipmentController.php | 21 +- .../CoreExtension/CartPriceRule.php | 17 +- .../OrderBundle/CoreShopOrderBundle.php | 17 +- .../OrderBundle/DTO/AddMultipleToCart.php | 17 +- .../DTO/AddMultipleToCartInterface.php | 17 +- .../Bundle/OrderBundle/DTO/AddToCart.php | 23 +- .../OrderBundle/DTO/AddToCartInterface.php | 17 +- .../Compiler/CartItemPriceRuleActionPass.php | 19 +- .../CartItemPriceRuleConditionPass.php | 19 +- .../Compiler/CartPriceRuleActionPass.php | 19 +- .../Compiler/CartPriceRuleConditionPass.php | 19 +- .../PurchasableDiscountCalculatorsPass.php | 19 +- ...urchasableDiscountPriceCalculatorsPass.php | 19 +- .../PurchasablePriceCalculatorsPass.php | 19 +- .../PurchasableRetailPriceCalculatorsPass.php | 19 +- ...rchasableWholesalePriceCalculatorsPass.php | 19 +- .../Compiler/RegisterCartProcessorPass.php | 19 +- .../RegisterWorkflowValidatorPass.php | 19 +- .../DependencyInjection/Configuration.php | 32 +- .../CoreShopOrderExtension.php | 40 +- .../Doctrine/ORM/CartPriceRuleRepository.php | 20 +- .../ORM/CartPriceRuleVoucherRepository.php | 24 +- .../Event/AdminAddressCreationEvent.php | 24 +- .../Event/AdminCustomerCreationEvent.php | 23 +- .../OrderBundle/Event/WkhtmlOptionsEvent.php | 17 +- .../CheckoutCartLocaleAssignerListener.php | 17 +- .../EventListener/Grid/CartFilterListener.php | 17 +- .../EventListener/SessionCartSubscriber.php | 26 +- src/CoreShop/Bundle/OrderBundle/Events.php | 17 +- .../OrderBundle/Expiration/CartExpiration.php | 17 +- .../Expiration/OrderExpiration.php | 28 +- .../Expiration/OrderExpirationInterface.php | 17 +- .../Factory/AddMultipleToCartFactory.php | 21 +- .../AddMultipleToCartFactoryInterface.php | 17 +- .../OrderBundle/Factory/AddToCartFactory.php | 21 +- .../Factory/AddToCartFactoryInterface.php | 17 +- .../DataMapper/CartItemQuantityDataMapper.php | 27 +- .../Form/Type/AddMultipleToCartType.php | 17 +- .../OrderBundle/Form/Type/AddToCartType.php | 17 +- .../Form/Type/AdminAddressCreationType.php | 20 +- .../Form/Type/AdminCustomerCreationType.php | 17 +- .../Form/Type/CartCreationCartItemType.php | 22 +- .../Form/Type/CartCreationType.php | 20 +- .../CartItemPriceRuleActionChoiceType.php | 17 +- .../CartItemPriceRuleActionCollectionType.php | 17 +- .../Form/Type/CartItemPriceRuleActionType.php | 20 +- .../CartItemPriceRuleConditionChoiceType.php | 17 +- ...rtItemPriceRuleConditionCollectionType.php | 17 +- .../Type/CartItemPriceRuleConditionType.php | 20 +- .../OrderBundle/Form/Type/CartItemType.php | 21 +- .../Type/CartPriceRuleActionChoiceType.php | 17 +- .../CartPriceRuleActionCollectionType.php | 17 +- .../Form/Type/CartPriceRuleActionType.php | 20 +- .../Form/Type/CartPriceRuleChoiceType.php | 20 +- .../Type/CartPriceRuleConditionChoiceType.php | 17 +- .../CartPriceRuleConditionCollectionType.php | 17 +- .../Form/Type/CartPriceRuleConditionType.php | 20 +- .../Type/CartPriceRuleTranslationType.php | 20 +- .../Form/Type/CartPriceRuleType.php | 20 +- .../Bundle/OrderBundle/Form/Type/CartType.php | 20 +- .../Form/Type/EditCartItemsCollectionType.php | 17 +- .../OrderBundle/Form/Type/EditCartType.php | 20 +- .../Type/OrderInvoiceCreationItemsType.php | 20 +- .../Form/Type/OrderInvoiceCreationType.php | 20 +- .../Type/OrderShipmentCreationItemsType.php | 20 +- .../Form/Type/OrderShipmentCreationType.php | 20 +- .../Form/Type/PurchasableSelectionType.php | 17 +- .../OrderBundle/Form/Type/QuantityType.php | 19 +- .../CartItemActionConfigurationType.php | 27 +- .../DiscountAmountConfigurationType.php | 22 +- .../DiscountPercentConfigurationType.php | 20 +- .../SurchargeAmountConfigurationType.php | 22 +- .../SurchargePercentConfigurationType.php | 20 +- .../Condition/AmountConfigurationType.php | 20 +- .../Condition/NestedConfigurationType.php | 20 +- .../Condition/TimespanConfigurationType.php | 17 +- .../Condition/VoucherConfigurationType.php | 20 +- .../Form/Type/ShippingCalculatorType.php | 20 +- .../Form/Type/VoucherGeneratorType.php | 20 +- .../OrderBundle/Form/Type/VoucherType.php | 20 +- .../OrderBundle/Manager/CartManager.php | 28 +- .../Operator/Factory/OrderStateFactory.php | 17 +- .../Factory/PriceFormatterFactory.php | 23 +- .../GridColumnConfig/Operator/OrderState.php | 28 +- .../Operator/PriceFormatter.php | 19 +- .../AbstractOrderDocumentRepository.php | 17 +- .../Pimcore/Repository/CartItemRepository.php | 17 +- .../Repository/OrderInvoiceRepository.php | 17 +- .../Repository/OrderItemRepository.php | 17 +- .../Pimcore/Repository/OrderRepository.php | 19 +- .../Repository/OrderShipmentRepository.php | 17 +- .../AssetOrderDocumentPdfRenderer.php | 23 +- .../Renderer/OrderDocumentPdfRenderer.php | 31 +- .../Renderer/Pdf/PdfRendererInterface.php | 17 +- .../OrderBundle/Renderer/Pdf/WkHtmlToPdf.php | 27 +- .../Resources/public/pimcore/css/order.css | 13 +- .../OrderInvoiceStateResolver.php | 26 +- .../OrderPaymentStateResolver.php | 23 +- .../OrderShippingStateResolver.php | 26 +- .../StateResolver/OrderStateResolver.php | 23 +- .../OrderBundle/Twig/OrderStateExtension.php | 17 +- .../Validator/Constraints/CartPriceRule.php | 17 +- .../Constraints/CartPriceRuleValidator.php | 25 +- .../Validator/Constraints/VoucherAmount.php | 17 +- .../Constraints/VoucherAmountValidator.php | 19 +- .../CoreExtension/PaymentProvider.php | 17 +- .../PaymentProviderMultiselect.php | 17 +- .../PaymentBundle/CoreShopPaymentBundle.php | 17 +- .../DependencyInjection/Configuration.php | 26 +- .../CoreShopPaymentExtension.php | 17 +- .../ORM/PaymentProviderRepository.php | 23 +- .../Doctrine/ORM/PaymentRepository.php | 20 +- .../Form/Type/PaymentProviderChoiceType.php | 20 +- .../Type/PaymentProviderTranslationType.php | 20 +- .../Form/Type/PaymentProviderType.php | 20 +- .../Resources/public/pimcore/css/payment.css | 13 +- .../Action/AuthorizePaymentAction.php | 19 +- .../Action/CapturePaymentAction.php | 19 +- .../PayumBundle/Action/ConfirmOrderAction.php | 17 +- ...uteSameRequestWithPaymentDetailsAction.php | 19 +- .../Action/Offline/ConfirmOrderAction.php | 17 +- .../Action/Offline/ConvertPaymentAction.php | 17 +- .../Action/Offline/ResolveNextRouteAction.php | 17 +- .../Action/Offline/StatusAction.php | 17 +- .../ExpressCheckout/ConvertPaymentAction.php | 26 +- .../Action/ResolveNextRouteAction.php | 17 +- .../Controller/PaymentController.php | 30 +- .../Bundle/PayumBundle/CoreGatewayFactory.php | 17 +- .../PayumBundle/CoreGatewayFactoryBuilder.php | 17 +- .../PayumBundle/CoreShopPayumBundle.php | 17 +- .../Compiler/PayumReplyToSymfonyPass.php | 17 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopPayumExtension.php | 17 +- .../EventListener/TransactionListener.php | 17 +- .../PayumBundle/Exception/ReplyException.php | 17 +- .../ReplyToSymfonyResponseConverter.php | 17 +- .../Extension/UpdateOrderStateExtension.php | 18 +- .../Extension/UpdatePaymentStateExtension.php | 18 +- .../Factory/ConfirmOrderFactory.php | 17 +- .../Factory/ConfirmOrderFactoryInterface.php | 17 +- .../PayumBundle/Factory/GetStatusFactory.php | 17 +- .../Factory/GetStatusFactoryInterface.php | 17 +- .../Factory/ResolveNextRouteFactory.php | 17 +- .../ResolveNextRouteFactoryInterface.php | 17 +- .../Type/PaypalGatewayConfigurationType.php | 20 +- .../Type/SofortGatewayConfigurationType.php | 20 +- .../PayumBundle/Request/ConfirmOrder.php | 17 +- .../Request/ConfirmOrderInterface.php | 17 +- .../Bundle/PayumBundle/Request/GetStatus.php | 18 +- .../PayumBundle/Request/ResolveNextRoute.php | 17 +- .../Request/ResolveNextRouteInterface.php | 17 +- .../PayumBundle/Storage/LockingStorage.php | 17 +- .../Controller/PaymentProviderController.php | 19 +- .../CoreShopPayumPaymentBundle.php | 17 +- .../RegisterGatewayConfigTypePass.php | 19 +- .../RegisterPaymentSettingsFormsPass.php | 22 +- .../DependencyInjection/Configuration.php | 23 +- .../CoreShopPayumPaymentExtension.php | 17 +- .../Event/PaymentProviderSupportsEvent.php | 23 +- .../Bundle/PayumPaymentBundle/Events.php | 17 +- .../PaymentProviderChoiceTypeExtension.php | 20 +- .../PaymentProviderTypeExtension.php | 20 +- .../Form/Type/GatewayConfigType.php | 22 +- .../EventBasedPaymentProviderResolver.php | 23 +- .../Command/AppMigrateCommand.php | 20 +- .../Command/AppMigrationGenerateCommand.php | 20 +- .../Admin/DynamicDropdownController.php | 33 +- .../Controller/Admin/GridController.php | 19 +- .../CoreExtension/DynamicDropdown.php | 17 +- .../CoreExtension/DynamicDropdownMultiple.php | 17 +- .../CoreExtension/DynamicDropdownTrait.php | 17 +- .../CoreExtension/ItemSelector.php | 17 +- .../CoreExtension/SerializedData.php | 17 +- .../CoreExtension/SuperBoxSelect.php | 17 +- .../PimcoreBundle/CoreShopPimcoreBundle.php | 17 +- .../DataHub/QueryType/SerializedData.php | 23 +- .../DataHub/Type/SerializedDataType.php | 17 +- .../ExpressionLanguageServicePass.php | 17 +- .../Compiler/RegisterGridActionPass.php | 19 +- .../Compiler/RegisterGridFilterPass.php | 19 +- .../RegisterImplementationLoaderPass.php | 23 +- ...oreDocumentTagImplementationLoaderPass.php | 19 +- .../RegisterPimcoreDocumentTagPass.php | 19 +- .../RegisterTypeHintRegistriesPass.php | 29 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopPimcoreExtension.php | 23 +- .../Extension/AbstractPimcoreExtension.php | 17 +- .../Bundle/PimcoreBundle/Event/MailEvent.php | 25 +- .../EventListener/AdminJavascriptListener.php | 25 +- .../Grid/ObjectListFilterListener.php | 17 +- .../EventListener/SluggableListener.php | 21 +- src/CoreShop/Bundle/PimcoreBundle/Events.php | 17 +- ...ependencyInjectionImplementationLoader.php | 17 +- .../PimcoreBundle/Mail/MailProcessor.php | 19 +- .../Resources/public/pimcore/css/pimcore.css | 13 +- .../data/coreShopDynamicDropdown.js | 13 +- .../data/coreShopDynamicDropdownMultiple.js | 13 +- .../data/coreShopItemSelector.js | 13 +- .../data/coreShopSuperBoxSelect.js | 13 +- .../tags/coreShopDynamicDropdown.js | 13 +- .../tags/coreShopDynamicDropdownMultiple.js | 13 +- .../tags/coreShopItemSelector.js | 13 +- .../tags/coreShopSuperBoxSelect.js | 13 +- .../Controller/ProductPriceRuleController.php | 17 +- .../ProductUnitDefinitionsController.php | 19 +- .../ProductSpecificPriceRules.php | 21 +- .../CoreExtension/ProductUnit.php | 17 +- .../CoreExtension/ProductUnitDefinition.php | 21 +- .../CoreExtension/ProductUnitDefinitions.php | 31 +- .../ProductBundle/CoreShopProductBundle.php | 17 +- .../ProductDiscountCalculatorsPass.php | 19 +- .../ProductDiscountPriceCalculatorsPass.php | 19 +- .../Compiler/ProductPriceRuleActionPass.php | 19 +- .../ProductPriceRuleConditionPass.php | 19 +- .../ProductRetailPriceCalculatorsPass.php | 19 +- .../ProductSpecificPriceRuleActionPass.php | 19 +- .../ProductSpecificPriceRuleConditionPass.php | 19 +- .../ProductValidPriceRuleFetcherPass.php | 19 +- .../DependencyInjection/Configuration.php | 26 +- .../CoreShopProductExtension.php | 41 +- .../Doctrine/ORM/PriceRuleRepository.php | 20 +- .../ORM/ProductPriceRuleRepository.php | 17 +- .../ProductSpecificPriceRuleRepository.php | 20 +- .../ORM/ProductUnitDefinitionsRepository.php | 20 +- .../Doctrine/ORM/ProductUnitRepository.php | 20 +- .../CategoryPersistEventListener.php | 17 +- .../ClearCachedPriceRulesListener.php | 17 +- .../EventListener/ProductDeleteListener.php | 23 +- .../Type/ProductPriceRuleActionChoiceType.php | 17 +- .../ProductPriceRuleActionCollectionType.php | 17 +- .../Form/Type/ProductPriceRuleActionType.php | 20 +- .../ProductPriceRuleConditionChoiceType.php | 17 +- ...roductPriceRuleConditionCollectionType.php | 17 +- .../Type/ProductPriceRuleConditionType.php | 20 +- .../Type/ProductPriceRuleTranslationType.php | 20 +- .../Form/Type/ProductPriceRuleType.php | 20 +- .../Form/Type/ProductSelectionType.php | 17 +- ...oductSpecificPriceRuleActionChoiceType.php | 17 +- ...tSpecificPriceRuleActionCollectionType.php | 17 +- .../ProductSpecificPriceRuleActionType.php | 20 +- ...ctSpecificPriceRuleConditionChoiceType.php | 17 +- ...ecificPriceRuleConditionCollectionType.php | 17 +- .../ProductSpecificPriceRuleConditionType.php | 20 +- ...roductSpecificPriceRuleTranslationType.php | 20 +- .../Type/ProductSpecificPriceRuleType.php | 20 +- .../DiscountAmountConfigurationType.php | 22 +- .../DiscountPercentConfigurationType.php | 20 +- .../Rule/Action/PriceConfigurationType.php | 22 +- .../ProductPriceNestedConfigurationType.php | 20 +- ...ctSpecificPriceNestedConfigurationType.php | 20 +- .../Condition/TimespanConfigurationType.php | 17 +- .../Form/Type/Unit/ProductUnitChoiceType.php | 20 +- .../ProductUnitDefinitionCollectionType.php | 17 +- ...oductUnitDefinitionPriceCollectionType.php | 17 +- .../Unit/ProductUnitDefinitionPriceType.php | 28 +- .../ProductUnitDefinitionSelectionType.php | 22 +- .../Type/Unit/ProductUnitDefinitionType.php | 20 +- .../Unit/ProductUnitDefinitionsChoiceType.php | 17 +- .../Type/Unit/ProductUnitDefinitionsType.php | 20 +- .../Type/Unit/ProductUnitTranslationType.php | 20 +- .../Form/Type/Unit/ProductUnitType.php | 20 +- .../Pimcore/Repository/CategoryRepository.php | 21 +- .../Pimcore/Repository/ProductRepository.php | 17 +- .../Resources/public/pimcore/css/product.css | 13 +- .../data/coreShopProductUnitDefinitions.js | 13 +- .../tags/coreShopProductUnitDefinitions.js | 13 +- .../pimcore/js/product/units/builder.js | 13 +- .../ProductQuantityPriceRules.php | 23 +- ...oreShopProductQuantityPriceRulesBundle.php | 17 +- .../ProductQuantityPriceRulesActionPass.php | 19 +- ...roductQuantityPriceRulesCalculatorPass.php | 19 +- ...ProductQuantityPriceRulesConditionPass.php | 19 +- .../DependencyInjection/Configuration.php | 26 +- ...ShopProductQuantityPriceRulesExtension.php | 26 +- .../ProductQuantityPriceRuleRepository.php | 26 +- ...roductQuantityPriceRuleValidationEvent.php | 23 +- ...ctQuantityPriceRuleConditionChoiceType.php | 17 +- ...antityPriceRuleConditionCollectionType.php | 17 +- .../ProductQuantityPriceRuleConditionType.php | 20 +- .../Type/ProductQuantityPriceRuleType.php | 27 +- .../ProductQuantityRangeCollectionType.php | 17 +- .../Form/Type/ProductQuantityRangeType.php | 28 +- ...antityPriceRuleNestedConfigurationType.php | 20 +- .../Condition/TimespanConfigurationType.php | 20 +- .../css/product-quanity-price-rules.css | 13 +- ...roductQuantityPriceRuleRangesExtension.php | 17 +- .../ResourceBundle/AbstractResourceBundle.php | 25 +- .../Command/CreateDatabaseTablesCommand.php | 32 +- .../Command/DropDatabaseTablesCommand.php | 32 +- .../Command/InstallResourcesCommand.php | 24 +- .../ComposerPackageBundleInterface.php | 17 +- .../Controller/AdminController.php | 17 +- .../Controller/EventDispatcher.php | 25 +- .../Controller/EventDispatcherInterface.php | 17 +- .../Controller/PimcoreController.php | 20 +- .../Controller/ResourceController.php | 22 +- .../Controller/ResourceFormFactory.php | 17 +- .../ResourceFormFactoryInterface.php | 17 +- .../Controller/ResourceSettingsController.php | 17 +- .../ResourceBundle/Controller/ViewHandler.php | 17 +- .../Controller/ViewHandlerInterface.php | 17 +- .../CoreExtension/CoreShopRelation.php | 18 +- .../CoreExtension/CoreShopRelations.php | 17 +- .../CoreExtension/Document/Select.php | 28 +- .../CoreExtension/Multiselect.php | 17 +- .../ResourceBundle/CoreExtension/Select.php | 21 +- .../CoreExtension/TempEntityManagerTrait.php | 17 +- .../ResourceBundle/CoreShopResourceBundle.php | 17 +- .../DataHub/QueryType/Multiselect.php | 23 +- .../DataHub/QueryType/Select.php | 19 +- .../Resolver/MultiResourceResolver.php | 23 +- .../DataHub/Resolver/ResourceResolver.php | 17 +- .../DoctrineTargetEntitiesResolverPass.php | 17 +- .../Compiler/PimcoreCachePass.php | 17 +- .../Compiler/RegisterInstallersPass.php | 19 +- .../RegisterPimcoreRepositoriesPass.php | 19 +- .../Compiler/RegisterPimcoreResourcesPass.php | 17 +- .../Compiler/RegisterResourcesPass.php | 19 +- .../Compiler/StackClassesPass.php | 17 +- .../Compiler/StackRepositoryPass.php | 23 +- .../Compiler/ValidatorAutoMappingFixPass.php | 17 +- .../DependencyInjection/Configuration.php | 29 +- .../CoreShopResourceExtension.php | 30 +- .../Driver/AbstractDriver.php | 25 +- .../Doctrine/AbstractDoctrineDriver.php | 24 +- .../Driver/Doctrine/DoctrineORMDriver.php | 23 +- .../Driver/DriverInterface.php | 17 +- .../Driver/DriverProvider.php | 17 +- .../Exception/InvalidDriverException.php | 25 +- .../Exception/UnknownDriverException.php | 19 +- .../Driver/Pimcore/PimcoreDriver.php | 25 +- .../Extension/AbstractModelExtension.php | 23 +- .../Doctrine/ORM/EntityMerger.php | 25 +- .../Doctrine/ORM/EntityRepository.php | 20 +- .../Doctrine/ResourceMappingDriverChain.php | 26 +- .../Event/ResourceControllerEvent.php | 17 +- .../AbstractDoctrineSubscriber.php | 18 +- .../EventListener/BodyListener.php | 17 +- .../EventListener/DeepCopySubscriber.php | 19 +- .../ORMMappedSuperClassSubscriber.php | 21 +- .../ORMRepositoryClassSubscriber.php | 17 +- .../EventListener/ORMTranslatableListener.php | 25 +- .../PimcoreAssetDataTransformer.php | 19 +- .../PimcoreResourceDataTransformer.php | 17 +- .../HttpFoundationRequestHandler.php | 19 +- .../Form/Helper/ErrorSerializer.php | 17 +- .../Form/Registry/FormTypeRegistry.php | 17 +- .../Registry/FormTypeRegistryInterface.php | 17 +- .../Form/Type/AbstractResourceType.php | 23 +- .../Form/Type/FixedCollectionType.php | 17 +- .../Form/Type/PimcoreAssetChoiceType.php | 17 +- .../Form/Type/PimcoreClassChoiceType.php | 17 +- .../Type/PimcoreResourceSelectionType.php | 17 +- .../Form/Type/ResourceTranslationsType.php | 17 +- .../Installer/CompositeResourceInstaller.php | 17 +- .../Configuration/DocumentConfiguration.php | 20 +- .../Configuration/GridConfigConfiguration.php | 20 +- .../ImageThumbnailConfiguration.php | 20 +- .../Configuration/RouteConfiguration.php | 20 +- .../TranslationConfiguration.php | 20 +- .../Installer/PimcoreClassInstaller.php | 23 +- .../PimcoreClassInstallerInterface.php | 17 +- .../PimcoreDependantBundleInstaller.php | 23 +- .../Installer/PimcoreDocumentsInstaller.php | 28 +- .../Installer/PimcoreGridConfigInstaller.php | 26 +- .../PimcoreImageThumbnailsInstaller.php | 17 +- .../Installer/PimcorePermissionInstaller.php | 23 +- .../Installer/PimcoreRoutesInstaller.php | 17 +- .../Installer/ResourceInstallerInterface.php | 17 +- .../ResourceBundle/Installer/SqlInstaller.php | 22 +- .../Pimcore/CacheMarshallerInterface.php | 17 +- .../Pimcore/CacheResourceMarshaller.php | 25 +- .../ResourceBundle/Pimcore/ObjectManager.php | 18 +- .../Pimcore/PimcoreDaoRepository.php | 31 +- .../Pimcore/PimcoreRepository.php | 23 +- .../Pimcore/Repository/StackRepository.php | 25 +- .../ResourceBundleInterface.php | 17 +- .../Resources/public/pimcore/css/resource.css | 13 +- .../ResourceBundle/Routing/Configuration.php | 20 +- .../ResourceBundle/Routing/ResourceLoader.php | 23 +- .../ResourceBundle/Routing/RouteFactory.php | 17 +- .../Routing/RouteFactoryInterface.php | 17 +- .../Serialization/CarbonHandler.php | 17 +- .../Driver/PimcoreDataObjectDriver.php | 17 +- .../Serialization/PimcoreAssetHandler.php | 17 +- .../Serialization/PimcoreDocumentHandler.php | 17 +- .../Serialization/PimcoreObjectHandler.php | 17 +- .../Serialization/PimcoreSiteHandler.php | 17 +- .../Serialization/RelationsHandler.php | 17 +- .../VersionObjectConstructor.php | 22 +- .../Validator/Constraints/Active.php | 17 +- .../Validator/Constraints/ActiveValidator.php | 20 +- .../Validator/Constraints/UniqueEntity.php | 17 +- .../Constraints/UniqueEntityValidator.php | 30 +- .../Assessor/RuleAvailabilityAssessor.php | 17 +- .../RuleBundle/Collector/RuleCollector.php | 17 +- .../RuleAvailabilityProcessorCommand.php | 20 +- .../Bundle/RuleBundle/CoreShopRuleBundle.php | 17 +- .../Compiler/RuleAvailabilityAssessorPass.php | 19 +- .../TraceableValidationProcessorPass.php | 18 +- .../DependencyInjection/Configuration.php | 23 +- .../CoreShopRuleExtension.php | 23 +- .../Doctrine/ORM/RuleRepository.php | 26 +- .../Event/RuleAvailabilityCheckEvent.php | 24 +- .../Form/DataMapper/ActionsFormMapper.php | 17 +- .../Form/DataMapper/ConditionsFormMapper.php | 17 +- .../AbstractConfigurableRuleElementType.php | 30 +- .../AbstractConfigurationCollectionType.php | 21 +- .../AbstractNestedConfigurationType.php | 20 +- .../Type/Rule/EmptyConfigurationFormType.php | 17 +- .../Form/Type/RuleActionChoiceType.php | 17 +- .../Form/Type/RuleActionCollectionType.php | 17 +- .../RuleBundle/Form/Type/RuleActionType.php | 17 +- .../Form/Type/RuleConditionChoiceType.php | 17 +- .../Form/Type/RuleConditionCollectionType.php | 17 +- .../Form/Type/RuleConditionType.php | 17 +- .../Bundle/RuleBundle/Form/Type/RuleType.php | 20 +- .../Processor/RuleAvailabilityProcessor.php | 26 +- .../RuleAvailabilityProcessorInterface.php | 17 +- .../Resources/public/pimcore/css/rule.css | 14 +- .../Bundle/SEOBundle/CoreShopSEOBundle.php | 17 +- .../Compiler/ExtractorRegistryServicePass.php | 19 +- .../CoreShopSEOExtension.php | 20 +- .../SequenceBundle/CoreShopSequenceBundle.php | 17 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopSequenceExtension.php | 17 +- .../Doctrine/ORM/SequenceRepository.php | 20 +- .../Controller/CarrierController.php | 19 +- .../Controller/ShippingRuleController.php | 17 +- .../ShippingBundle/CoreExtension/Carrier.php | 17 +- .../CoreExtension/CarrierMultiselect.php | 17 +- .../ShippingBundle/CoreShopShippingBundle.php | 17 +- .../CompositeShippableValidatorPass.php | 19 +- .../Compiler/ShippingPriceCalculatorsPass.php | 19 +- .../Compiler/ShippingRuleActionPass.php | 19 +- .../Compiler/ShippingRuleConditionPass.php | 19 +- .../ShippingTaxCalculationStrategyPass.php | 19 +- .../DependencyInjection/Configuration.php | 26 +- .../CoreShopShippingExtension.php | 32 +- .../Form/Type/CarrierChoiceType.php | 20 +- .../Form/Type/CarrierTranslationType.php | 20 +- .../ShippingBundle/Form/Type/CarrierType.php | 20 +- ...AdditionPercentActionConfigurationType.php | 20 +- ...DiscountPercentActionConfigurationType.php | 20 +- .../Common/ShippingRuleConfigurationType.php | 22 +- .../Condition/AmountConfigurationType.php | 20 +- .../Condition/DimensionConfigurationType.php | 20 +- .../Condition/NestedConfigurationType.php | 20 +- .../Condition/PostcodeConfigurationType.php | 20 +- .../Condition/WeightConfigurationType.php | 20 +- .../Type/ShippingRuleActionChoiceType.php | 17 +- .../Type/ShippingRuleActionCollectionType.php | 17 +- .../Form/Type/ShippingRuleActionType.php | 20 +- .../Form/Type/ShippingRuleChoiceType.php | 20 +- .../Type/ShippingRuleConditionChoiceType.php | 17 +- .../ShippingRuleConditionCollectionType.php | 17 +- .../Form/Type/ShippingRuleConditionType.php | 20 +- .../Type/ShippingRuleGroupCollectionType.php | 17 +- .../Form/Type/ShippingRuleGroupType.php | 20 +- .../Form/Type/ShippingRuleType.php | 20 +- ...ippingTaxCalculationStrategyChoiceType.php | 17 +- .../Resources/public/pimcore/css/shipping.css | 14 +- .../Controller/StorageListController.php | 29 +- .../SessionStoreStorageListSubscriber.php | 23 +- .../StorageListBlamerListener.php | 19 +- .../CoreShopStorageListBundle.php | 17 +- .../Compiler/RegisterStorageListPass.php | 26 +- .../RegisterStorageListProcessorPass.php | 26 +- .../DependencyInjection/Configuration.php | 21 +- .../CoreShopStorageListExtension.php | 39 +- .../EventListener/SessionSubscriber.php | 21 +- .../Form/Type/AddToStorageListType.php | 17 +- .../Form/Type/StorageListItemType.php | 18 +- .../Form/Type/StorageListType.php | 21 +- .../PimcoreStorageListRepository.php | 17 +- .../StoreBundle/Collector/StoreCollector.php | 19 +- .../Context/Debug/DebugStoreContext.php | 24 +- .../Context/Debug/DebugStorePersister.php | 17 +- .../Context/Debug/DebugStoreProvider.php | 17 +- .../Debug/DebugStoreProviderInterface.php | 17 +- .../Controller/StoreController.php | 17 +- .../StoreBundle/CoreExtension/Store.php | 19 +- .../CoreExtension/StoreMultiselect.php | 19 +- .../CoreExtension/StoreOptionProvider.php | 26 +- .../StoreBundle/CoreShopStoreBundle.php | 17 +- .../Compiler/CompositeRequestResolverPass.php | 19 +- .../Compiler/CompositeStoreContextPass.php | 19 +- .../DependencyInjection/Configuration.php | 23 +- .../CoreShopStoreExtension.php | 23 +- .../Doctrine/ORM/StoreRepository.php | 23 +- .../StoreBundle/Form/Type/StoreChoiceType.php | 20 +- .../StoreBundle/Form/Type/StoreType.php | 20 +- .../StoreBundle/Helper/PimcoreSiteHelper.php | 17 +- .../Helper/PimcoreSiteHelperInterface.php | 17 +- .../Resources/public/pimcore/css/store.css | 14 +- .../StoreBundle/Theme/StoreThemeResolver.php | 17 +- .../Controller/TaxRuleGroupController.php | 17 +- .../TaxationBundle/CoreExtension/TaxRate.php | 18 +- .../CoreExtension/TaxRuleGroup.php | 17 +- .../TaxationBundle/CoreShopTaxationBundle.php | 17 +- .../DependencyInjection/Configuration.php | 23 +- .../CoreShopTaxationExtension.php | 17 +- .../Doctrine/ORM/TaxRateRepository.php | 20 +- .../Doctrine/ORM/TaxRuleRepository.php | 20 +- .../Form/Type/TaxRateChoiceType.php | 20 +- .../Form/Type/TaxRateTranslationType.php | 20 +- .../TaxationBundle/Form/Type/TaxRateType.php | 20 +- .../Form/Type/TaxRuleGroupChoiceType.php | 20 +- .../Form/Type/TaxRuleGroupType.php | 22 +- .../TaxationBundle/Form/Type/TaxRuleType.php | 20 +- .../Resources/public/pimcore/css/taxation.css | 14 +- .../Bundle/TestBundle/CoreShopTestBundle.php | 17 +- .../CoreShopTestExtension.php | 17 +- .../ThemeBundle/Context/ThemeContext.php | 24 +- .../ThemeBundle/CoreShopThemeBundle.php | 17 +- .../Compiler/CompositeThemeResolverPass.php | 19 +- .../RemoveThemeAwareTranslatorPass.php | 20 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopThemeExtension.php | 20 +- .../EventListener/DocumentRenderListener.php | 22 +- .../Service/CompositeThemeResolver.php | 17 +- .../DocumentThemeResolverInterface.php | 17 +- .../PimcoreDocumentPropertyResolver.php | 24 +- .../Service/PimcoreSiteThemeResolver.php | 25 +- .../ThemeBundle/Service/ThemeHelper.php | 23 +- .../Service/ThemeHelperInterface.php | 17 +- .../Service/ThemeNotResolvedException.php | 17 +- .../Service/ThemeResolverInterface.php | 19 +- .../TrackingBundle/CoreShopTrackingBundle.php | 17 +- .../Compiler/TrackerPass.php | 19 +- .../Compiler/TrackingExtractorPass.php | 19 +- .../DependencyInjection/Configuration.php | 20 +- .../CoreShopTrackingExtension.php | 29 +- .../GtmDataLayerBlockListener.php | 25 +- .../Resolver/ConfigResolver.php | 23 +- .../Resolver/ConfigResolverInterface.php | 17 +- .../Tracker/AbstractEcommerceTracker.php | 25 +- .../Google/AnalyticsEnhancedEcommerce.php | 19 +- .../Google/GlobalSiteTagEnhancedEcommerce.php | 19 +- .../Tracker/Google/TagManager/CodeTracker.php | 17 +- .../TagManager/TagManagerClassicEcommerce.php | 17 +- .../TagManagerEnhancedEcommerce.php | 17 +- .../Tracker/Google/UniversalEcommerce.php | 19 +- .../Bundle/UserBundle/CoreShopUserBundle.php | 17 +- .../DependencyInjection/Configuration.php | 29 +- .../CoreShopUserExtension.php | 17 +- .../Event/RequestPasswordChangeEvent.php | 23 +- .../Form/Type/ChangePasswordType.php | 20 +- .../Form/Type/RequestResetPasswordType.php | 19 +- .../Form/Type/ResetPasswordType.php | 20 +- .../UserBundle/Form/Type/UserLoginType.php | 20 +- .../Pimcore/Repository/UserRepository.php | 17 +- .../Resources/public/pimcore/css/user.css | 14 +- .../VariantBundle/CoreShopVariantBundle.php | 17 +- .../DependencyInjection/Configuration.php | 31 +- .../CoreShopVariantExtension.php | 19 +- .../EventListener/AttributeListener.php | 33 +- .../EventListener/MainVariantListener.php | 17 +- .../EventListener/ProductListener.php | 32 +- .../Pimcore/VariantLinkGenerator.php | 25 +- .../Twig/Extension/VariantExtension.php | 19 +- .../Validator/Constraints/ValidAttributes.php | 17 +- .../Constraints/ValidAttributesType.php | 17 +- .../ValidAttributesTypeValidator.php | 27 +- .../Constraints/ValidAttributesValidator.php | 11 - .../WishlistBundle/CoreShopWishlistBundle.php | 17 +- .../DependencyInjection/Configuration.php | 24 +- .../CoreShopWishlistExtension.php | 17 +- .../Form/Type/AddToWishlistType.php | 17 +- .../Form/Type/WishlistItemType.php | 18 +- .../WishlistBundle/Form/Type/WishlistType.php | 21 +- .../Repository/WishlistItemRepository.php | 17 +- .../Pimcore/Repository/WishlistRepository.php | 17 +- .../Applier/StateMachineApplier.php | 17 +- .../Applier/StateMachineApplierInterface.php | 17 +- .../Callback/CascadeTransition.php | 17 +- .../WorkflowBundle/CoreShopWorkflowBundle.php | 17 +- .../DependencyInjection/Configuration.php | 35 +- .../CoreShopWorkflowExtension.php | 17 +- .../Event/WorkflowTransitionEvent.php | 23 +- .../EventListener/WorkflowListener.php | 25 +- .../WorkflowBundle/History/HistoryLogger.php | 30 +- .../History/HistoryLoggerInterface.php | 19 +- .../History/HistoryRepository.php | 17 +- .../History/HistoryRepositoryInterface.php | 17 +- .../History/StateHistoryLogger.php | 28 +- .../History/StateHistoryLoggerInterface.php | 17 +- .../Manager/StateMachineManager.php | 17 +- .../Manager/StateMachineManagerInterface.php | 17 +- .../OrmPersistentMarkingStore.php | 23 +- .../PimcorePersistentMarkingStore.php | 23 +- src/CoreShop/Bundle/WorkflowBundle/Notes.php | 17 +- .../StateManager/WorkflowStateInfoManager.php | 26 +- .../WorkflowStateInfoManagerInterface.php | 17 +- .../Context/CompositeCountryContext.php | 18 +- .../Context/CountryContextInterface.php | 17 +- .../Context/CountryNotFoundException.php | 17 +- .../Address/Context/FixedCountryContext.php | 17 +- .../RequestBased/CachedCountryContext.php | 17 +- .../RequestBased/CompositeRequestResolver.php | 18 +- .../Context/RequestBased/CountryContext.php | 23 +- .../GeoLiteBasedRequestResolver.php | 26 +- .../RequestBased/RequestResolverInterface.php | 17 +- .../Address/Formatter/AddressFormatter.php | 23 +- .../Formatter/AddressFormatterInterface.php | 17 +- .../Component/Address/Model/Address.php | 17 +- .../Address/Model/AddressIdentifier.php | 18 +- .../Model/AddressIdentifierInterface.php | 17 +- .../Address/Model/AddressInterface.php | 17 +- .../Address/Model/AddressesAwareInterface.php | 17 +- .../Address/Model/AddressesAwareTrait.php | 17 +- .../Address/Model/CountriesAwareInterface.php | 17 +- .../Address/Model/CountriesAwareTrait.php | 17 +- .../Component/Address/Model/Country.php | 21 +- .../Address/Model/CountryInterface.php | 17 +- .../Address/Model/CountryTranslation.php | 17 +- .../Model/CountryTranslationInterface.php | 17 +- .../Model/DefaultAddressAwareInterface.php | 17 +- .../Component/Address/Model/State.php | 19 +- .../Address/Model/StateInterface.php | 17 +- .../Address/Model/StateTranslation.php | 17 +- .../Model/StateTranslationInterface.php | 17 +- src/CoreShop/Component/Address/Model/Zone.php | 18 +- .../Component/Address/Model/ZoneInterface.php | 17 +- .../AddressIdentifierRepositoryInterface.php | 17 +- .../Repository/CountryRepositoryInterface.php | 19 +- .../Configuration/Model/Configuration.php | 18 +- .../Model/ConfigurationInterface.php | 17 +- .../ConfigurationRepositoryInterface.php | 17 +- .../Service/ConfigurationService.php | 24 +- .../Service/ConfigurationServiceInterface.php | 17 +- .../Core/Cart/CartContextResolver.php | 17 +- .../Action/DiscountAmountActionProcessor.php | 30 +- .../Action/DiscountPercentActionProcessor.php | 19 +- .../Action/FreeShippingActionProcessor.php | 17 +- .../Action/GiftProductActionProcessor.php | 26 +- .../Action/SurchargeAmountActionProcessor.php | 30 +- .../SurchargePercentActionProcessor.php | 19 +- .../Action/VoucherCreditActionProcessor.php | 30 +- .../Cart/Rule/Applier/CartRuleApplier.php | 50 +-- .../Rule/Applier/CartRuleApplierInterface.php | 21 +- .../Condition/CarriersConditionChecker.php | 17 +- .../Condition/CategoriesConditionChecker.php | 21 +- .../Condition/CountriesConditionChecker.php | 17 +- .../Condition/CurrenciesConditionChecker.php | 17 +- .../CustomerGroupsConditionChecker.php | 17 +- .../Condition/CustomersConditionChecker.php | 17 +- .../Condition/ProductsConditionChecker.php | 17 +- .../Rule/Condition/StoresConditionChecker.php | 17 +- .../Rule/Condition/ZonesConditionChecker.php | 17 +- .../Action/DiscountAmountActionProcessor.php | 28 +- .../Action/DiscountPercentActionProcessor.php | 23 +- .../Rule/Applier/CartItemRuleApplier.php | 45 +- .../Applier/CartItemRuleApplierInterface.php | 21 +- .../Condition/CategoriesConditionChecker.php | 21 +- .../Condition/ProductsConditionChecker.php | 21 +- .../Configuration/ConfigurationService.php | 19 +- .../ConfigurationServiceInterface.php | 17 +- .../Country/StoreAwareCountryContext.php | 23 +- .../Currency/CountryAwareCurrencyContext.php | 17 +- .../Currency/StorageBasedCurrencyContext.php | 23 +- .../Currency/StoreAwareCurrencyContext.php | 24 +- .../Component/Core/Context/ShopperContext.php | 30 +- .../Core/Context/ShopperContextInterface.php | 17 +- .../Core/Context/StoreBasedCartContext.php | 22 +- .../Context/TokenBasedCustomerContext.php | 17 +- .../Core/Currency/CurrencyStorage.php | 23 +- .../Currency/CurrencyStorageInterface.php | 17 +- .../Address/AddressAccessOptionsProvider.php | 17 +- .../Address/AddressAssignmentManager.php | 19 +- .../AddressAssignmentManagerInterface.php | 17 +- .../Allocator/CustomerAddressAllocator.php | 17 +- .../CustomerAddressAllocatorInterface.php | 17 +- .../Core/Customer/CustomerTransformHelper.php | 33 +- .../CustomerTransformHelperInterface.php | 17 +- src/CoreShop/Component/Core/Events.php | 17 +- .../Extensions/ProductClassExtension.php | 17 +- .../Operator/OrderInventoryOperator.php | 47 +- .../OrderInventoryOperatorInterface.php | 17 +- .../Context/PimcoreAdminLocaleContext.php | 25 +- src/CoreShop/Component/Core/Model/Carrier.php | 17 +- .../Component/Core/Model/CarrierInterface.php | 17 +- .../Component/Core/Model/Category.php | 17 +- .../Core/Model/CategoryInterface.php | 17 +- src/CoreShop/Component/Core/Model/Company.php | 17 +- .../Component/Core/Model/CompanyInterface.php | 17 +- .../Component/Core/Model/Configuration.php | 17 +- .../Core/Model/ConfigurationInterface.php | 17 +- src/CoreShop/Component/Core/Model/Country.php | 17 +- .../Component/Core/Model/CountryInterface.php | 17 +- .../Component/Core/Model/Currency.php | 17 +- .../Core/Model/CurrencyInterface.php | 17 +- .../Component/Core/Model/Customer.php | 17 +- .../Core/Model/CustomerInterface.php | 17 +- src/CoreShop/Component/Core/Model/Order.php | 17 +- .../Component/Core/Model/OrderInterface.php | 17 +- .../Component/Core/Model/OrderItem.php | 17 +- .../Core/Model/OrderItemInterface.php | 17 +- .../Component/Core/Model/OrderShipment.php | 17 +- .../Core/Model/OrderShipmentInterface.php | 17 +- .../Core/Model/OrderShipmentItem.php | 17 +- .../Core/Model/OrderShipmentItemInterface.php | 17 +- src/CoreShop/Component/Core/Model/Payment.php | 17 +- .../Component/Core/Model/PaymentInterface.php | 17 +- .../Component/Core/Model/PaymentProvider.php | 17 +- .../Core/Model/PaymentProviderInterface.php | 17 +- .../Model/PimcoreStoresAwareInterface.php | 17 +- src/CoreShop/Component/Core/Model/Product.php | 17 +- .../Component/Core/Model/ProductInterface.php | 17 +- .../Core/Model/ProductQuantityPriceRule.php | 17 +- .../ProductQuantityPriceRuleInterface.php | 17 +- .../Core/Model/ProductStoreValues.php | 17 +- .../Model/ProductStoreValuesInterface.php | 17 +- .../Core/Model/ProductUnitDefinitionPrice.php | 17 +- .../ProductUnitDefinitionPriceInterface.php | 17 +- .../Component/Core/Model/QuantityRange.php | 17 +- .../Core/Model/QuantityRangeInterface.php | 17 +- src/CoreShop/Component/Core/Model/Store.php | 17 +- .../Component/Core/Model/StoreInterface.php | 17 +- src/CoreShop/Component/Core/Model/TaxRule.php | 17 +- .../Component/Core/Model/TaxRuleInterface.php | 17 +- src/CoreShop/Component/Core/Model/User.php | 17 +- .../Component/Core/Model/UserInterface.php | 17 +- .../Component/Core/Model/Wishlist.php | 18 +- .../Core/Model/WishlistInterface.php | 20 +- .../Action/Order/OrderMailActionProcessor.php | 17 +- .../Action/Order/StoreMailActionProcessor.php | 24 +- .../Order/StoreOrderMailActionProcessor.php | 17 +- .../Condition/Order/BackendCreatedChecker.php | 17 +- .../Rule/Condition/Order/CarriersChecker.php | 17 +- .../Rule/Condition/Order/CommentChecker.php | 17 +- .../Rule/Condition/SimpleStateChecker.php | 19 +- .../Rule/Condition/StateTransitionChecker.php | 19 +- .../Rule/Condition/StoresChecker.php | 17 +- .../Rule/Condition/User/UserTypeChecker.php | 17 +- .../PurchasableProductDiscountCalculator.php | 17 +- ...chasableProductDiscountPriceCalculator.php | 17 +- .../PurchasableProductPriceCalculator.php | 17 +- ...urchasableProductRetailPriceCalculator.php | 17 +- .../Core/Order/Committer/OrderCommitter.php | 28 +- .../Core/Order/Committer/QuoteCommitter.php | 29 +- .../Modifier/CartItemQuantityModifier.php | 19 +- .../NumberGenerator/SaleNumberGenerator.php | 25 +- .../Order/OrderMailProcessorInterface.php | 17 +- .../Order/Processor/CartAdjustmentClearer.php | 17 +- .../CartCurrencyConversionProcessor.php | 23 +- .../Order/Processor/CartItemProcessor.php | 47 +- .../Order/Processor/CartItemsProcessor.php | 35 +- .../Processor/CartItemsWholesaleProcessor.php | 25 +- .../Order/Processor/CartPaymentProcessor.php | 25 +- .../CartPriceRuleVoucherProcessor.php | 27 +- .../Order/Processor/CartRuleAutoProcessor.php | 24 +- .../Order/Processor/CartShippingProcessor.php | 35 +- .../Core/Order/Processor/CartTaxProcessor.php | 24 +- .../Order/Processor/CartTextProcessor.php | 17 +- .../OrderItemToShipmentItemTransformer.php | 19 +- .../OrderToShipmentTransformer.php | 19 +- .../StoreBasedPaymentProviderResolver.php | 23 +- .../Core/Portlet/ExportPortletInterface.php | 17 +- .../Core/Portlet/PortletInterface.php | 17 +- .../StoreProductPriceCalculator.php | 11 - ...reProductUnitDefinitionPriceCalculator.php | 17 +- .../Product/Cloner/ProductClonerInterface.php | 17 +- .../ProductQuantityPriceRulesCloner.php | 27 +- .../Cloner/ProductUnitDefinitionsCloner.php | 23 +- .../Core/Product/Cloner/UnitMatcher.php | 17 +- .../Product/Cloner/UnitMatcherInterface.php | 16 +- .../Product/ProductTaxCalculatorFactory.php | 19 +- .../ProductTaxCalculatorFactoryInterface.php | 19 +- .../Condition/CategoriesConditionChecker.php | 21 +- .../Condition/CountriesConditionChecker.php | 19 +- .../Condition/CurrenciesConditionChecker.php | 19 +- .../CustomerGroupsConditionChecker.php | 19 +- .../Condition/CustomersConditionChecker.php | 19 +- .../Condition/ProductsConditionChecker.php | 21 +- .../Condition/QuantityConditionChecker.php | 19 +- .../Rule/Condition/StoresConditionChecker.php | 19 +- .../Rule/Condition/ZonesConditionChecker.php | 19 +- .../Product/TaxedProductPriceCalculator.php | 25 +- .../TaxedProductPriceCalculatorInterface.php | 17 +- .../Calculator/UnitVolumeCalculator.php | 35 +- .../Rule/Action/AmountDecreaseAction.php | 17 +- .../Rule/Action/AmountIncreaseAction.php | 17 +- .../Rule/Action/FixedAction.php | 17 +- .../Provider/AddressProviderInterface.php | 17 +- .../ContextBasedDefaultTaxAddressProvider.php | 17 +- .../DefaultTaxAddressProviderInterface.php | 17 +- .../Provider/StoreBasedAddressProvider.php | 23 +- .../Core/Report/ExportReportInterface.php | 17 +- .../Component/Core/Report/ReportInterface.php | 17 +- .../Repository/CarrierRepositoryInterface.php | 17 +- .../CategoryRepositoryInterface.php | 17 +- .../ConfigurationRepositoryInterface.php | 17 +- .../Repository/CountryRepositoryInterface.php | 17 +- .../CurrencyRepositoryInterface.php | 17 +- .../CustomerRepositoryInterface.php | 17 +- .../PaymentProviderRepositoryInterface.php | 17 +- .../Repository/ProductRepositoryInterface.php | 17 +- .../ProductStoreValuesRepositoryInterface.php | 20 +- .../ProductVariantRepositoryInterface.php | 17 +- .../Repository/TaxRuleRepositoryInterface.php | 17 +- .../CategoriesConditionCheckerTrait.php | 17 +- .../Condition/ProductVariantsCheckerTrait.php | 17 +- .../TaxedCarrierPriceRuleCalculator.php | 25 +- .../StoreBasedShippableCarriersDiscovery.php | 24 +- .../CheapestDefaultCarrierResolver.php | 24 +- .../Action/AdditionAmountActionProcessor.php | 23 +- .../Action/DiscountAmountActionProcessor.php | 23 +- .../Rule/Action/PriceActionProcessor.php | 23 +- .../Condition/CategoriesConditionChecker.php | 21 +- .../Condition/CountriesConditionChecker.php | 19 +- .../Condition/CurrenciesConditionChecker.php | 19 +- .../CustomerGroupsConditionChecker.php | 19 +- .../Condition/CustomersConditionChecker.php | 19 +- .../Condition/ProductsConditionChecker.php | 21 +- .../Rule/Condition/StoresConditionChecker.php | 19 +- .../Rule/Condition/ZonesConditionChecker.php | 19 +- .../TaxCalculationStrategyCartItems.php | 21 +- .../TaxCalculationStrategyTaxRule.php | 22 +- .../Taxation/CachedTaxCalculatorFactory.php | 23 +- .../DefaultTaxationDisplayProvider.php | 17 +- .../Component/Core/Taxation/TaxApplicator.php | 19 +- .../Core/Taxation/TaxApplicatorInterface.php | 19 +- .../Core/Taxation/TaxCalculatorFactory.php | 19 +- .../TaxCalculatorFactoryInterface.php | 17 +- .../TaxationDisplayProviderInterface.php | 17 +- .../Tracking/Extractor/OrderExtractor.php | 28 +- .../Tracking/Extractor/OrderItemExtractor.php | 17 +- .../Tracking/Extractor/ProductExtractor.php | 26 +- ...ranslatableEntityPimcoreLocaleAssigner.php | 23 +- .../WishlistRepositoryInterface.php | 17 +- .../Context/CachedCurrencyContext.php | 23 +- .../Context/CompositeCurrencyContext.php | 18 +- .../Context/CurrencyContextInterface.php | 17 +- .../Context/CurrencyNotFoundException.php | 25 +- .../Currency/Context/FixedCurrencyContext.php | 17 +- .../Currency/Converter/CurrencyConverter.php | 27 +- .../Converter/CurrencyConverterInterface.php | 17 +- .../DefaultDisplayFractionProvider.php | 17 +- .../DisplayFractionProviderInterface.php | 17 +- .../Formatter/MoneyFormatterInterface.php | 17 +- .../Component/Currency/Model/Currency.php | 17 +- .../Currency/Model/CurrencyAwareInterface.php | 17 +- .../Currency/Model/CurrencyAwareTrait.php | 17 +- .../Currency/Model/CurrencyInterface.php | 17 +- .../Component/Currency/Model/ExchangeRate.php | 18 +- .../Currency/Model/ExchangeRateInterface.php | 17 +- .../Component/Currency/Model/Money.php | 23 +- .../CurrencyRepositoryInterface.php | 17 +- .../ExchangeRateRepositoryInterface.php | 17 +- .../Context/CompositeCustomerContext.php | 18 +- .../Context/CustomerContextInterface.php | 17 +- .../Context/CustomerNotFoundException.php | 17 +- .../Customer/Context/FixedCustomerContext.php | 17 +- .../RequestBased/CompositeRequestResolver.php | 18 +- .../Context/RequestBased/CustomerContext.php | 23 +- .../RequestBased/RequestResolverInterface.php | 17 +- .../Component/Customer/Model/Company.php | 17 +- .../Customer/Model/CompanyInterface.php | 17 +- .../Component/Customer/Model/Customer.php | 17 +- .../Customer/Model/CustomerAwareInterface.php | 17 +- .../Customer/Model/CustomerGroup.php | 17 +- .../Customer/Model/CustomerGroupInterface.php | 17 +- .../Customer/Model/CustomerInterface.php | 17 +- .../Repository/CompanyRepositoryInterface.php | 17 +- .../CustomerRepositoryInterface.php | 17 +- .../Index/Condition/CompareCondition.php | 24 +- .../Index/Condition/ConcatCondition.php | 24 +- .../Index/Condition/ConditionInterface.php | 17 +- .../Index/Condition/ConditionRenderer.php | 19 +- .../Condition/ConditionRendererInterface.php | 17 +- .../Condition/DynamicRendererInterface.php | 17 +- .../Index/Condition/GreaterThanCondition.php | 23 +- .../Condition/GreaterThanEqualCondition.php | 23 +- .../Component/Index/Condition/InCondition.php | 23 +- .../Component/Index/Condition/IsCondition.php | 23 +- .../Index/Condition/IsNotNullCondition.php | 17 +- .../Index/Condition/IsNullCondition.php | 17 +- .../Index/Condition/LikeCondition.php | 24 +- .../Index/Condition/LowerThanCondition.php | 23 +- .../Condition/LowerThanEqualCondition.php | 23 +- .../Index/Condition/MatchCondition.php | 23 +- .../Index/Condition/NotInCondition.php | 17 +- .../Index/Condition/NotLikeCondition.php | 17 +- .../Index/Condition/NotMatchCondition.php | 23 +- .../Index/Condition/RangeCondition.php | 24 +- .../DecimalIndexColumnTypeConfigExtension.php | 17 +- .../IndexColumnTypeConfigExtension.php | 17 +- .../IndexColumnsExtensionInterface.php | 17 +- .../Extension/IndexExtensionInterface.php | 17 +- ...dexRelationalColumnsExtensionInterface.php | 17 +- .../IndexSystemColumnTypeConfigExtension.php | 17 +- .../FilteredListingFactoryInterface.php | 17 +- .../Index/Factory/ListingFactoryInterface.php | 17 +- .../BooleanFilterConditionProcessor.php | 27 +- .../CategoryMultiSelectConditionProcessor.php | 25 +- .../CategorySelectConditionProcessor.php | 25 +- .../FilterConditionProcessorInterface.php | 21 +- .../FilterPreConditionProcessorInterface.php | 17 +- .../Index/Filter/FilterProcessor.php | 23 +- .../Index/Filter/FilterProcessorInterface.php | 17 +- .../FilterUserConditionProcessorInterface.php | 17 +- ...ilterConditionFromMultiselectProcessor.php | 17 +- .../MultiselectFilterConditionProcessor.php | 17 +- .../Filter/NestedFilterConditionProcessor.php | 21 +- .../Filter/RangeFilterConditionProcessor.php | 23 +- ...elationalMultiselectConditionProcessor.php | 17 +- .../RelationalSelectConditionProcessor.php | 19 +- .../Index/Filter/SearchConditionProcessor.php | 19 +- ...ilterConditionFromMultiselectProcessor.php | 17 +- .../Filter/SelectFilterConditionProcessor.php | 19 +- .../Component/Index/Getter/BrickGetter.php | 21 +- .../Getter/ClassificationStoreGetter.php | 17 +- .../Index/Getter/FieldCollectionGetter.php | 21 +- .../Index/Getter/GetterInterface.php | 17 +- .../Index/Getter/LocalizedFieldGetter.php | 20 +- .../Interpreter/ExpressionInterpreter.php | 25 +- .../Interpreter/InterpreterInterface.php | 19 +- .../Index/Interpreter/IteratorInterpreter.php | 19 +- .../Interpreter/LocaleMappingInterpreter.php | 21 +- .../LocalizedInterpreterInterface.php | 19 +- .../LocalizedNestedInterpreter.php | 21 +- .../Index/Interpreter/NestedInterpreter.php | 19 +- .../Index/Interpreter/NestedTrait.php | 17 +- .../Index/Interpreter/ObjectIdInterpreter.php | 19 +- .../Interpreter/ObjectIdSumInterpreter.php | 19 +- .../Index/Interpreter/ObjectInterpreter.php | 17 +- .../Interpreter/ObjectPropertyInterpreter.php | 19 +- .../Interpreter/QuantityValueInterpreter.php | 19 +- .../RelationInterpreterInterface.php | 19 +- .../RelationalNestedInterpreter.php | 21 +- .../Index/Interpreter/RelationalValue.php | 24 +- .../Interpreter/RelationalValueInterface.php | 17 +- .../Index/Interpreter/SoundexInterpreter.php | 21 +- .../Interpreter/TimestampInterpreter.php | 19 +- .../Listing/ExtendedListingInterface.php | 19 +- .../Index/Listing/ListingInterface.php | 17 +- .../Listing/OrderAwareListingInterface.php | 17 +- src/CoreShop/Component/Index/Model/Filter.php | 17 +- .../Component/Index/Model/FilterCondition.php | 17 +- .../Index/Model/FilterConditionInterface.php | 17 +- .../Component/Index/Model/FilterInterface.php | 17 +- src/CoreShop/Component/Index/Model/Index.php | 17 +- .../Component/Index/Model/IndexColumn.php | 17 +- .../Index/Model/IndexColumnInterface.php | 17 +- .../Component/Index/Model/IndexInterface.php | 17 +- .../Index/Model/IndexableInterface.php | 17 +- .../Order/DynamicOrderRendererInterface.php | 17 +- .../Component/Index/Order/OrderInterface.php | 17 +- .../Component/Index/Order/OrderRenderer.php | 19 +- .../Index/Order/OrderRendererInterface.php | 17 +- .../Component/Index/Order/SimpleOrder.php | 23 +- .../Index/Service/IndexUpdaterService.php | 23 +- .../Service/IndexUpdaterServiceInterface.php | 17 +- .../Index/Worker/FilterGroupHelper.php | 19 +- .../Worker/FilterGroupHelperInterface.php | 17 +- .../Index/Worker/WorkerInterface.php | 17 +- .../Inventory/Checker/AvailabilityChecker.php | 17 +- .../Checker/AvailabilityCheckerInterface.php | 17 +- .../Inventory/Model/StockableInterface.php | 17 +- .../Locale/Context/CompositeLocaleContext.php | 18 +- .../Locale/Context/FixedLocaleContext.php | 17 +- .../Locale/Context/LocaleContextInterface.php | 17 +- .../Context/LocaleNotFoundException.php | 25 +- .../Locale/Context/PimcoreLocaleContext.php | 18 +- .../Locale/Model/LocaleAwareInterface.php | 17 +- .../Notification/Model/NotificationRule.php | 17 +- .../Model/NotificationRuleInterface.php | 17 +- .../Notification/Processor/RuleApplier.php | 17 +- .../Processor/RuleApplierInterface.php | 17 +- .../Notification/Processor/RulesProcessor.php | 24 +- .../Processor/RulesProcessorInterface.php | 17 +- .../NotificationRuleRepositoryInterface.php | 17 +- .../Rule/Action/MailActionProcessor.php | 17 +- .../NotificationRuleProcessorInterface.php | 17 +- .../Condition/AbstractConditionChecker.php | 17 +- .../NotificationConditionCheckerInterface.php | 17 +- ...CompositePurchasableDiscountCalculator.php | 17 +- ...sitePurchasableDiscountPriceCalculator.php | 17 +- .../CompositePurchasablePriceCalculator.php | 17 +- ...positePurchasableRetailPriceCalculator.php | 17 +- ...itePurchasableWholesalePriceCalculator.php | 17 +- .../NoDiscountPurchasableCalculator.php | 17 +- .../Calculator/PurchasableCalculator.php | 25 +- .../PurchasableCalculatorInterface.php | 17 +- ...PurchasableDiscountCalculatorInterface.php | 17 +- ...asableDiscountPriceCalculatorInterface.php | 17 +- .../Calculator/PurchasablePriceCalculator.php | 24 +- .../PurchasablePriceCalculatorInterface.php | 17 +- ...chasableRetailPriceCalculatorInterface.php | 17 +- .../PurchasableWholesalePriceCalculator.php | 17 +- ...sableWholesalePriceCalculatorInterface.php | 17 +- .../Order/Cart/CartContextResolver.php | 17 +- .../Cart/CartContextResolverInterface.php | 17 +- .../Component/Order/Cart/CartItemResolver.php | 17 +- .../Component/Order/Cart/CartModifier.php | 34 +- .../Order/Cart/CartModifierInterface.php | 17 +- .../Rule/Action/CartItemActionProcessor.php | 33 +- .../CartPriceRuleActionProcessorInterface.php | 17 +- .../Cart/Rule/CartPriceRuleProcessor.php | 23 +- .../Rule/CartPriceRuleProcessorInterface.php | 17 +- .../Cart/Rule/CartPriceRuleUnProcessor.php | 17 +- .../CartPriceRuleUnProcessorInterface.php | 17 +- .../Rule/CartPriceRuleValidationProcessor.php | 19 +- ...tPriceRuleValidationProcessorInterface.php | 17 +- .../Condition/AbstractConditionChecker.php | 17 +- .../Rule/Condition/AmountConditionChecker.php | 17 +- .../CartRuleConditionCheckerInterface.php | 17 +- .../Condition/TimeSpanConditionChecker.php | 17 +- .../Condition/VoucherConditionChecker.php | 17 +- .../Rule/ProposalCartPriceRuleCalculator.php | 23 +- ...oposalCartPriceRuleCalculatorInterface.php | 17 +- src/CoreShop/Component/Order/CartEvents.php | 17 +- ...tItemPriceRuleActionProcessorInterface.php | 17 +- .../Condition/AbstractConditionChecker.php | 17 +- .../Rule/Condition/AmountConditionChecker.php | 17 +- ...derItemActionConditionCheckerInterface.php | 17 +- .../Order/Checkout/CheckoutException.php | 23 +- .../Order/Checkout/CheckoutManager.php | 17 +- .../CheckoutManagerFactoryInterface.php | 17 +- .../Checkout/CheckoutManagerInterface.php | 17 +- .../Order/Checkout/CheckoutStepInterface.php | 17 +- .../DefaultCheckoutManagerFactory.php | 23 +- .../OptionalCheckoutStepInterface.php | 17 +- .../RedirectCheckoutStepInterface.php | 17 +- .../ValidationCheckoutStepInterface.php | 17 +- .../Component/Order/CheckoutEvents.php | 17 +- .../Committer/OrderCommitterInterface.php | 17 +- .../Committer/QuoteCommitterInterface.php | 17 +- .../Component/Order/Context/CartContext.php | 19 +- .../Order/Context/CartContextInterface.php | 17 +- .../Order/Context/CartNotFoundException.php | 23 +- .../Order/Context/CompositeCartContext.php | 17 +- .../Order/Context/FixedCartContext.php | 17 +- .../Order/Distributor/FloatDistributor.php | 23 +- .../Distributor/FloatDistributorInterface.php | 17 +- .../Order/Distributor/IntegerDistributor.php | 19 +- .../IntegerDistributorInterface.php | 17 +- .../ProportionalIntegerDistributor.php | 19 +- ...roportionalIntegerDistributorInterface.php | 17 +- .../Component/Order/Event/CheckoutEvent.php | 17 +- .../FailedCodeGenerationException.php | 21 +- ...PurchasableDiscountPriceFoundException.php | 23 +- .../NoPurchasablePriceFoundException.php | 23 +- ...NoPurchasableRetailPriceFoundException.php | 23 +- ...urchasableWholesalePriceFoundException.php | 23 +- .../Order/Factory/AdjustmentFactory.php | 17 +- .../Factory/AdjustmentFactoryInterface.php | 17 +- .../Component/Order/Factory/OrderFactory.php | 17 +- .../Order/Factory/OrderItemFactory.php | 17 +- .../Factory/OrderItemFactoryInterface.php | 17 +- .../CartPriceRuleVoucherCodeGenerator.php | 25 +- .../Order/Generator/CodeGeneratorChecker.php | 30 +- .../CodeGeneratorCheckerInterface.php | 17 +- .../Generator/CodeGeneratorLetterResolver.php | 17 +- .../Component/Order/InvoiceStates.php | 17 +- .../Component/Order/InvoiceTransitions.php | 17 +- .../Order/Manager/CartManagerInterface.php | 17 +- .../Order/Model/AdjustableInterface.php | 17 +- .../Component/Order/Model/AdjustableTrait.php | 11 - .../Component/Order/Model/Adjustment.php | 19 +- .../Order/Model/AdjustmentInterface.php | 17 +- .../Component/Order/Model/CartPriceRule.php | 18 +- .../Order/Model/CartPriceRuleInterface.php | 17 +- .../Order/Model/CartPriceRuleTranslation.php | 17 +- .../CartPriceRuleTranslationInterface.php | 17 +- .../Order/Model/CartPriceRuleVoucherCode.php | 18 +- .../CartPriceRuleVoucherCodeInterface.php | 17 +- .../Model/CartPriceRuleVoucherGenerator.php | 17 +- ...CartPriceRuleVoucherGeneratorInterface.php | 17 +- .../Model/ConvertedAdjustableInterface.php | 17 +- .../Order/Model/ConvertedAdjustableTrait.php | 11 - src/CoreShop/Component/Order/Model/Order.php | 21 +- .../Order/Model/OrderDocumentInterface.php | 17 +- .../Model/OrderDocumentItemInterface.php | 17 +- .../Component/Order/Model/OrderInterface.php | 11 - .../Component/Order/Model/OrderInvoice.php | 18 +- .../Order/Model/OrderInvoiceInterface.php | 17 +- .../Order/Model/OrderInvoiceItem.php | 17 +- .../Order/Model/OrderInvoiceItemInterface.php | 17 +- .../Component/Order/Model/OrderItem.php | 23 +- .../Order/Model/OrderItemInterface.php | 11 - .../Order/Model/OrderPaymentInterface.php | 17 +- .../Component/Order/Model/OrderShipment.php | 17 +- .../Order/Model/OrderShipmentInterface.php | 17 +- .../Order/Model/OrderShipmentItem.php | 17 +- .../Model/OrderShipmentItemInterface.php | 17 +- .../Component/Order/Model/PriceRuleItem.php | 17 +- .../Order/Model/PriceRuleItemInterface.php | 11 - .../Order/Model/ProposalCartPriceRuleItem.php | 21 +- .../ProposalCartPriceRuleItemInterface.php | 17 +- .../Order/Model/ProposalPriceRuleTrait.php | 11 - .../Order/Model/PurchasableInterface.php | 17 +- .../Order/Modifier/VoucherModifier.php | 23 +- .../Modifier/VoucherModifierInterface.php | 17 +- src/CoreShop/Component/Order/Notes.php | 17 +- .../NumberGeneratorInterface.php | 17 +- .../SequenceNumberGenerator.php | 25 +- .../Component/Order/OrderInvoiceStates.php | 17 +- .../Order/OrderInvoiceTransitions.php | 17 +- .../Component/Order/OrderPaymentStates.php | 17 +- .../Order/OrderPaymentTransitions.php | 17 +- .../Component/Order/OrderSaleStates.php | 17 +- .../Component/Order/OrderSaleTransitions.php | 17 +- .../Component/Order/OrderShipmentStates.php | 17 +- .../Order/OrderShipmentTransitions.php | 17 +- src/CoreShop/Component/Order/OrderStates.php | 17 +- .../Component/Order/OrderTransitions.php | 17 +- .../Order/Payment/OrderPaymentProvider.php | 29 +- .../Payment/OrderPaymentProviderInterface.php | 17 +- .../Processable/ProcessableInterface.php | 17 +- .../Processable/ProcessableOrderItems.php | 23 +- .../Processor/CartItemProcessorInterface.php | 19 +- .../Processor/CartProcessorInterface.php | 17 +- .../Processor/CompositeCartProcessor.php | 17 +- src/CoreShop/Component/Order/QuoteStates.php | 11 - .../Component/Order/QuoteTransitions.php | 11 - .../OrderDocumentRendererInterface.php | 17 +- .../CartItemRepositoryInterface.php | 17 +- .../CartPriceRuleRepositoryInterface.php | 17 +- ...artPriceRuleVoucherRepositoryInterface.php | 17 +- .../OrderDocumentRepositoryInterface.php | 17 +- .../OrderInvoiceRepositoryInterface.php | 17 +- .../OrderItemRepositoryInterface.php | 17 +- .../Repository/OrderRepositoryInterface.php | 17 +- .../OrderShipmentRepositoryInterface.php | 17 +- .../Component/Order/ShipmentStates.php | 17 +- .../Component/Order/ShipmentTransitions.php | 17 +- .../StateResolver/StateResolverInterface.php | 17 +- .../OrderDocumentItemTransformerInterface.php | 19 +- .../OrderDocumentTransformerInterface.php | 19 +- .../OrderItemToInvoiceItemTransformer.php | 29 +- .../OrderItemToShipmentItemTransformer.php | 29 +- .../Transformer/OrderToInvoiceTransformer.php | 35 +- ...rderDocumentTransformerWorkflowApplier.php | 26 +- .../OrderToShipmentTransformer.php | 33 +- .../TransformerEventDispatcher.php | 21 +- .../TransformerEventDispatcherInterface.php | 17 +- .../Payment/Model/PayableInterface.php | 17 +- .../Component/Payment/Model/Payment.php | 18 +- .../Payment/Model/PaymentInterface.php | 17 +- .../Payment/Model/PaymentProvider.php | 19 +- .../Model/PaymentProviderInterface.php | 17 +- .../Model/PaymentProviderTranslation.php | 17 +- .../PaymentProviderTranslationInterface.php | 17 +- .../Model/PaymentSettingsAwareInterface.php | 17 +- .../Component/Payment/PaymentTransitions.php | 17 +- .../PaymentProviderRepositoryInterface.php | 17 +- .../Repository/PaymentRepositoryInterface.php | 17 +- .../Resolver/PaymentProviderResolver.php | 17 +- .../PaymentProviderResolverInterface.php | 17 +- .../PayumPayment/Model/GatewayConfig.php | 17 +- .../PayumPayment/Model/PaymentProvider.php | 17 +- .../Model/PaymentProviderInterface.php | 17 +- .../Model/PaymentSecurityToken.php | 17 +- .../Pimcore/BatchProcessing/BatchListing.php | 23 +- .../DataObjectBatchListing.php | 29 +- .../DataObject/AbstractDefinitionUpdate.php | 39 +- .../AbstractSluggableLinkGenerator.php | 25 +- .../DataObject/BrickDefinitionUpdate.php | 17 +- .../Pimcore/DataObject/ClassInstaller.php | 17 +- .../DataObject/ClassInstallerInterface.php | 17 +- .../Pimcore/DataObject/ClassUpdate.php | 27 +- .../DataObject/ClassUpdateInterface.php | 17 +- .../Pimcore/DataObject/DataLoader.php | 17 +- .../DataObject/DataLoaderInterface.php | 17 +- .../DefinitionFieldReNamerInterface.php | 17 +- .../Pimcore/DataObject/EditmodeHelper.php | 17 +- .../FieldCollectionDefinitionUpdate.php | 17 +- .../DataObject/Grid/GridActionInterface.php | 17 +- .../DataObject/Grid/GridFilterInterface.php | 17 +- .../DataObject/GridConfigInstaller.php | 17 +- .../GridConfigInstallerInterface.php | 17 +- .../Pimcore/DataObject/InheritanceHelper.php | 17 +- .../DataObject/LocaleFallbackHelper.php | 17 +- .../Pimcore/DataObject/NoteService.php | 21 +- .../DataObject/NoteServiceInterface.php | 17 +- .../Pimcore/DataObject/ObjectCloner.php | 17 +- .../DataObject/ObjectClonerInterface.php | 17 +- .../Pimcore/DataObject/ObjectService.php | 17 +- .../DataObject/ObjectServiceInterface.php | 17 +- .../Pimcore/DataObject/UnpublishedHelper.php | 17 +- .../Pimcore/DataObject/VersionHelper.php | 17 +- .../Document/DocumentTagFactoryInterface.php | 17 +- .../ClassDefinitionAlreadyExistsException.php | 17 +- .../ClassDefinitionFieldNotFoundException.php | 17 +- .../ClassDefinitionNotFoundException.php | 17 +- .../Exception/SlugNotPossibleException.php | 17 +- .../PHPFunctionsProvider.php | 17 +- .../PimcoreLanguageProvider.php | 17 +- src/CoreShop/Component/Pimcore/Mail.php | 17 +- .../Pimcore/Mail/MailProcessorInterface.php | 17 +- .../Pimcore/Migration/SharedTranslation.php | 17 +- .../Component/Pimcore/ResourceLoader.php | 17 +- .../Pimcore/Slug/SluggableInterface.php | 17 +- .../Pimcore/Slug/SluggableLinkGenerator.php | 25 +- .../Pimcore/Slug/SluggableSlugger.php | 23 +- .../Slug/SluggableSluggerInterface.php | 17 +- .../Extension/DataObjectRoutingExtension.php | 17 +- .../CompositeDiscountCalculator.php | 17 +- .../CompositeDiscountPriceCalculator.php | 17 +- .../CompositeRetailPriceCalculator.php | 17 +- .../MemoryCachedProductPriceCalculator.php | 25 +- .../ProductDiscountCalculatorInterface.php | 17 +- ...roductDiscountPriceCalculatorInterface.php | 17 +- .../Calculator/ProductPriceCalculator.php | 24 +- .../ProductPriceCalculatorInterface.php | 17 +- .../ProductRetailPriceCalculatorInterface.php | 17 +- .../NoDiscountPriceFoundException.php | 23 +- .../Exception/NoPriceFoundException.php | 23 +- .../Exception/NoRetailPriceFoundException.php | 23 +- .../Product/Model/AbstractPriceRule.php | 18 +- .../Component/Product/Model/Category.php | 17 +- .../Product/Model/CategoryInterface.php | 17 +- .../Component/Product/Model/Manufacturer.php | 17 +- .../Product/Model/ManufacturerInterface.php | 17 +- .../Product/Model/PriceRuleInterface.php | 17 +- .../Product/Model/PriceRuleTranslation.php | 17 +- .../Model/PriceRuleTranslationInterface.php | 17 +- .../Component/Product/Model/Product.php | 17 +- .../Product/Model/ProductInterface.php | 17 +- .../Product/Model/ProductPriceRule.php | 17 +- .../Model/ProductPriceRuleInterface.php | 17 +- .../Model/ProductPriceRuleTranslation.php | 17 +- .../ProductPriceRuleTranslationInterface.php | 17 +- .../Model/ProductSpecificPriceRule.php | 17 +- .../ProductSpecificPriceRuleInterface.php | 17 +- .../ProductSpecificPriceRuleTranslation.php | 17 +- ...tSpecificPriceRuleTranslationInterface.php | 17 +- .../Component/Product/Model/ProductUnit.php | 18 +- .../Product/Model/ProductUnitDefinition.php | 17 +- .../Model/ProductUnitDefinitionInterface.php | 17 +- .../Model/ProductUnitDefinitionPrice.php | 17 +- .../ProductUnitDefinitionPriceInterface.php | 17 +- .../Product/Model/ProductUnitDefinitions.php | 20 +- .../Model/ProductUnitDefinitionsInterface.php | 17 +- .../Product/Model/ProductUnitInterface.php | 17 +- .../Product/Model/ProductUnitTranslation.php | 17 +- .../Model/ProductUnitTranslationInterface.php | 17 +- .../CategoryRepositoryInterface.php | 17 +- .../PriceRuleRepositoryInterface.php | 17 +- .../ProductPriceRuleRepositoryInterface.php | 17 +- .../Repository/ProductRepositoryInterface.php | 17 +- ...ctSpecificPriceRuleRepositoryInterface.php | 17 +- ...ductUnitDefinitionsRepositoryInterface.php | 17 +- .../ProductUnitRepositoryInterface.php | 17 +- .../Rule/Action/ActionProcessorInterface.php | 17 +- .../Action/DiscountAmountActionProcessor.php | 23 +- .../Action/DiscountPercentActionProcessor.php | 19 +- .../Action/DiscountPriceActionProcessor.php | 23 +- .../Rule/Action/PriceActionProcessor.php | 23 +- .../ProductActionProcessorInterface.php | 17 +- ...roductDiscountActionProcessorInterface.php | 17 +- ...tDiscountPriceActionProcessorInterface.php | 17 +- .../ProductPriceActionProcessorInterface.php | 17 +- ...roductSpecificActionProcessorInterface.php | 17 +- .../Calculator/ProductPriceRuleCalculator.php | 23 +- .../ProductConditionCheckerInterface.php | 17 +- ...oductSpecificConditionCheckerInterface.php | 17 +- .../Condition/TimeSpanConditionChecker.php | 17 +- .../Fetcher/CompositeValidRuleFetcher.php | 17 +- .../Fetcher/MemoryCachedValidRuleFetcher.php | 23 +- .../Fetcher/ValidProductPriceRuleFetcher.php | 23 +- .../ValidProductSpecificPriceRuleFetcher.php | 17 +- .../Fetcher/ValidRulesFetcherInterface.php | 17 +- .../Calculator/CalculatorInterface.php | 21 +- .../Calculator/VolumeCalculator.php | 21 +- .../Detector/QuantityReferenceDetector.php | 23 +- .../QuantityReferenceDetectorInterface.php | 17 +- .../ProductQuantityPriceRules/Events.php | 17 +- .../Exception/NoPriceFoundException.php | 23 +- .../Exception/NoRuleFoundException.php | 23 +- .../Fetcher/QuantityPriceFetcher.php | 21 +- .../Fetcher/QuantityPriceFetcherInterface.php | 21 +- .../Fetcher/QuantityRuleFetcher.php | 17 +- .../Fetcher/QuantityRuleFetcherInterface.php | 17 +- .../Model/ProductQuantityPriceRule.php | 19 +- .../ProductQuantityPriceRuleInterface.php | 17 +- .../Model/QuantityRange.php | 17 +- .../Model/QuantityRangeInterface.php | 17 +- .../QuantityRangePriceAwareInterface.php | 17 +- ...ctQuantityPriceRuleRepositoryInterface.php | 17 +- .../Rule/Action/PercentageDecreaseAction.php | 19 +- .../Rule/Action/PercentageIncreaseAction.php | 19 +- ...roductQuantityPriceRuleActionInterface.php | 17 +- .../QuantityRuleConditionCheckerInterface.php | 17 +- .../Fetcher/MemoryCachedValidRuleFetcher.php | 23 +- .../ValidProductQuantityPriceRuleFetcher.php | 17 +- .../Fetcher/ValidRulesFetcherInterface.php | 17 +- .../Registry/ExistingServiceException.php | 23 +- .../Registry/NonExistingServiceException.php | 26 +- .../PrioritizedCompositeServicePass.php | 25 +- .../Registry/PrioritizedServiceRegistry.php | 25 +- .../PrioritizedServiceRegistryInterface.php | 17 +- .../Component/Registry/PriorityMap.php | 17 +- .../Registry/RegisterRegistryTypePass.php | 28 +- .../RegisterSimpleRegistryTypePass.php | 24 +- .../Component/Registry/ServiceRegistry.php | 25 +- .../Registry/ServiceRegistryInterface.php | 17 +- .../Resource/DataHub/DoctrineProvider.php | 17 +- .../Resource/DataHub/QueryType/Resource.php | 26 +- .../DataHub/QueryType/ResourceList.php | 17 +- .../DataHub/Resolver/DoctrineField.php | 23 +- .../DataHub/Resolver/DoctrineToMany.php | 24 +- .../DataHub/Resolver/DoctrineToOne.php | 24 +- .../Resource/DataHub/Type/ArrayType.php | 17 +- .../Resource/DataHub/Type/JsonType.php | 17 +- .../Doctrine/Type/BigIntIntegerType.php | 19 +- .../Resource/Doctrine/Type/PimcoreAsset.php | 17 +- .../Doctrine/Type/PimcoreDocument.php | 17 +- .../Resource/Doctrine/Type/PimcoreObject.php | 17 +- .../Resource/Doctrine/Type/PimcoreSite.php | 17 +- .../ImplementedByPimcoreException.php | 31 +- .../Exception/NiceValidationException.php | 11 - .../Exception/UnexpectedTypeException.php | 25 +- .../Exception/UnsupportedMethodException.php | 19 +- .../Component/Resource/Factory/Factory.php | 19 +- .../Resource/Factory/FactoryInterface.php | 11 - .../Resource/Factory/PimcoreFactory.php | 19 +- .../Factory/PimcoreFactoryInterface.php | 17 +- .../Factory/PimcoreRepositoryFactory.php | 19 +- .../Resource/Factory/RepositoryFactory.php | 21 +- .../Factory/RepositoryFactoryInterface.php | 17 +- .../Resource/Factory/TranslatableFactory.php | 23 +- .../Factory/TranslatableFactoryInterface.php | 17 +- .../Component/Resource/Metadata/Metadata.php | 24 +- .../Resource/Metadata/MetadataInterface.php | 17 +- .../Component/Resource/Metadata/Registry.php | 17 +- .../Resource/Metadata/RegistryInterface.php | 17 +- .../Resource/Model/AbstractObject.php | 17 +- .../Resource/Model/AbstractResource.php | 17 +- .../Resource/Model/AbstractTranslation.php | 17 +- .../Resource/Model/ResourceInterface.php | 17 +- .../Resource/Model/SetValuesTrait.php | 17 +- .../Resource/Model/TimestampableInterface.php | 17 +- .../Resource/Model/TimestampableTrait.php | 17 +- .../Resource/Model/ToggleableInterface.php | 17 +- .../Resource/Model/ToggleableTrait.php | 17 +- .../Resource/Model/TranslatableInterface.php | 18 +- .../Resource/Model/TranslatableTrait.php | 18 +- .../Resource/Model/TranslationInterface.php | 17 +- .../Model/AbstractPimcoreFieldcollection.php | 17 +- .../Pimcore/Model/AbstractPimcoreModel.php | 17 +- .../Pimcore/Model/PimcoreModelInterface.php | 11 - .../Pimcore/ResourceDocumentTagFactory.php | 19 +- .../PimcoreDaoRepositoryInterface.php | 17 +- .../Repository/PimcoreRepositoryInterface.php | 17 +- .../Repository/RepositoryInterface.php | 17 +- .../Service/FolderCreationService.php | 25 +- .../FolderCreationServiceInterface.php | 17 +- .../Resource/Storage/StorageInterface.php | 17 +- .../TokenGenerator/UniqueTokenGenerator.php | 21 +- .../PimcoreTranslationLocaleProvider.php | 17 +- .../TranslationLocaleProviderInterface.php | 17 +- .../TranslatableEntityLocaleAssigner.php | 23 +- ...nslatableEntityLocaleAssignerInterface.php | 17 +- .../RuleAvailabilityAssessorInterface.php | 17 +- .../Condition/ConditionCheckerInterface.php | 17 +- .../Rule/Condition/NestedConditionChecker.php | 17 +- .../RuleConditionsValidationProcessor.php | 23 +- ...ConditionsValidationProcessorInterface.php | 17 +- .../Condition/RuleValidationProcessor.php | 17 +- .../RuleValidationProcessorInterface.php | 17 +- ...eableRuleConditionsValidationProcessor.php | 19 +- ...ConditionsValidationProcessorInterface.php | 17 +- src/CoreShop/Component/Rule/Model/Action.php | 17 +- .../Component/Rule/Model/ActionInterface.php | 17 +- .../Component/Rule/Model/Condition.php | 17 +- .../Rule/Model/ConditionInterface.php | 17 +- .../Component/Rule/Model/RuleInterface.php | 17 +- .../Component/Rule/Model/RuleTrait.php | 19 +- .../Repository/RuleRepositoryInterface.php | 17 +- .../SEO/Extractor/DescriptionExtractor.php | 17 +- .../SEO/Extractor/DocumentExtractor.php | 17 +- .../SEO/Extractor/ExtractorInterface.php | 17 +- .../SEO/Extractor/ImageExtractor.php | 20 +- .../Component/SEO/Extractor/OGExtractor.php | 17 +- .../SEO/Extractor/TitleExtractor.php | 17 +- .../SEO/Model/PimcoreSEOAwareInterface.php | 17 +- .../Component/SEO/Model/SEOAwareInterface.php | 17 +- .../SEO/Model/SEOImageAwareInterface.php | 17 +- .../Component/SEO/Model/SEOMetadata.php | 21 +- .../SEO/Model/SEOMetadataInterface.php | 17 +- .../SEO/Model/SEOOpenGraphAwareInterface.php | 17 +- .../Component/SEO/SEOPresentation.php | 24 +- .../SEO/SEOPresentationInterface.php | 17 +- .../Sequence/Factory/SequenceFactory.php | 19 +- .../Factory/SequenceFactoryInterface.php | 17 +- .../Sequence/Generator/SequenceGenerator.php | 24 +- .../Generator/SequenceGeneratorInterface.php | 17 +- .../Component/Sequence/Model/Sequence.php | 17 +- .../Sequence/Model/SequenceInterface.php | 17 +- .../SequenceRepositoryInterface.php | 17 +- .../Calculator/CarrierPriceCalculator.php | 17 +- .../CarrierPriceCalculatorInterface.php | 17 +- .../CarrierShippingRulePriceCalculator.php | 27 +- .../Calculator/CompositePriceCalculator.php | 17 +- .../TaxedShippingCalculatorInterface.php | 19 +- .../Checker/CarrierShippingRuleChecker.php | 19 +- .../CarrierShippingRuleCheckerInterface.php | 17 +- .../NoShippingPriceFoundException.php | 23 +- .../UnresolvedDefaultCarrierException.php | 17 +- .../Component/Shipping/Model/Carrier.php | 20 +- .../Shipping/Model/CarrierAwareInterface.php | 17 +- .../Shipping/Model/CarrierAwareTrait.php | 17 +- .../Shipping/Model/CarrierInterface.php | 17 +- .../Shipping/Model/CarrierTranslation.php | 17 +- .../Model/CarrierTranslationInterface.php | 17 +- .../Shipping/Model/ShippableInterface.php | 17 +- .../Shipping/Model/ShippableItemInterface.php | 17 +- .../Component/Shipping/Model/ShippingRule.php | 17 +- .../Shipping/Model/ShippingRuleGroup.php | 18 +- .../Model/ShippingRuleGroupInterface.php | 17 +- .../Shipping/Model/ShippingRuleInterface.php | 17 +- .../Processor/ShippingRuleActionProcessor.php | 25 +- .../Shipping/Resolver/CarriersResolver.php | 23 +- .../Resolver/CarriersResolverInterface.php | 17 +- .../DefaultCarrierResolverInterface.php | 17 +- .../Action/AdditionPercentActionProcessor.php | 19 +- .../CarrierActionProcessorInterface.php | 17 +- .../CarrierPriceActionProcessorInterface.php | 19 +- ...ceModificationActionProcessorInterface.php | 19 +- .../Action/DiscountPercentActionProcessor.php | 19 +- .../Action/ShippingRuleActionProcessor.php | 27 +- .../Condition/AbstractConditionChecker.php | 17 +- .../Rule/Condition/AmountConditionChecker.php | 17 +- .../Condition/DimensionConditionChecker.php | 17 +- .../Condition/PostcodeConditionChecker.php | 21 +- .../ShippingConditionCheckerInterface.php | 17 +- .../ShippingRuleConditionChecker.php | 23 +- .../Rule/Condition/WeightConditionChecker.php | 17 +- .../ShippingRuleActionProcessorInterface.php | 17 +- .../TaxCalculationStrategyInterface.php | 17 +- .../CompositeShippableCarrierValidator.php | 17 +- .../ShippableCarrierValidatorInterface.php | 17 +- .../ShippingRuleCarrierValidator.php | 17 +- .../Context/CompositeStorageListContext.php | 18 +- .../Context/StorageListContextInterface.php | 17 +- .../Context/StorageListFactoryContext.php | 17 +- .../Context/StorageListNotFoundException.php | 25 +- ...ustomerAndStoreBasedStorageListContext.php | 21 +- ...SessionAndStoreBasedStorageListContext.php | 20 +- .../Context/StoreBasedStorageListContext.php | 22 +- ...stomerAndStoreAwareRepositoryInterface.php | 17 +- .../StorageList/DTO/AddToStorageList.php | 17 +- .../DTO/AddToStorageListInterface.php | 17 +- .../Factory/AddToStorageListFactory.php | 23 +- .../AddToStorageListFactoryInterface.php | 19 +- .../Factory/StorageListFactory.php | 17 +- .../Factory/StorageListItemFactory.php | 17 +- .../StorageListItemFactoryInterface.php | 17 +- .../Manager/StorageListManagerInterface.php | 17 +- .../StorageListPimcoreModelManager.php | 23 +- .../StorageList/Model/StorageList.php | 17 +- .../Model/StorageListInterface.php | 17 +- .../StorageList/Model/StorageListItem.php | 17 +- .../Model/StorageListItemInterface.php | 17 +- .../PimcoreStorageListRepositoryInterface.php | 17 +- .../StorageListRepositoryInterface.php | 17 +- .../SessionStorageListModifier.php | 17 +- .../StorageList/SessionStorageManager.php | 21 +- .../StorageList/SimpleStorageListModifier.php | 19 +- .../StorageListItemModelEqualsResolver.php | 17 +- .../StorageListItemQuantityModifier.php | 17 +- ...orageListItemQuantityModifierInterface.php | 17 +- .../StorageList/StorageListItemResolver.php | 17 +- .../StorageListItemResolverInterface.php | 17 +- .../StorageListManagerInterface.php | 17 +- .../StorageListModifierInterface.php | 17 +- .../StorageList/StorageListsManager.php | 11 - .../Store/Context/CompositeStoreContext.php | 18 +- .../Store/Context/FixedStoreContext.php | 17 +- .../RequestBased/CachedStoreContext.php | 17 +- .../RequestBased/CompositeRequestResolver.php | 17 +- .../PimcoreAdminSiteBasedRequestResolver.php | 26 +- .../PimcoreAreaBrickRenderResolver.php | 19 +- .../RequestBased/RequestResolverInterface.php | 17 +- .../RequestBased/SiteBasedRequestResolver.php | 17 +- .../Context/RequestBased/StoreContext.php | 23 +- .../Store/Context/StoreContextInterface.php | 17 +- .../Store/Context/StoreNotFoundException.php | 17 +- src/CoreShop/Component/Store/Model/Store.php | 18 +- .../Store/Model/StoreAwareInterface.php | 17 +- .../Component/Store/Model/StoreAwareTrait.php | 17 +- .../Component/Store/Model/StoreInterface.php | 17 +- .../Store/Model/StoresAwareInterface.php | 17 +- .../Store/Model/StoresAwareTrait.php | 17 +- .../Repository/StoreRepositoryInterface.php | 17 +- .../Calculator/TaxCalculatorInterface.php | 17 +- .../Calculator/TaxRulesTaxCalculator.php | 41 +- .../Taxation/Collector/TaxCollector.php | 23 +- .../Collector/TaxCollectorInterface.php | 17 +- .../Component/Taxation/Model/TaxItem.php | 17 +- .../Taxation/Model/TaxItemInterface.php | 17 +- .../Component/Taxation/Model/TaxRate.php | 19 +- .../Taxation/Model/TaxRateInterface.php | 17 +- .../Taxation/Model/TaxRateTranslation.php | 17 +- .../Model/TaxRateTranslationInterface.php | 17 +- .../Component/Taxation/Model/TaxRule.php | 17 +- .../Component/Taxation/Model/TaxRuleGroup.php | 18 +- .../Taxation/Model/TaxRuleGroupInterface.php | 17 +- .../Taxation/Model/TaxRuleInterface.php | 17 +- .../Repository/TaxRateRepositoryInterface.php | 17 +- .../Repository/TaxRuleRepositoryInterface.php | 17 +- .../Tracking/Extractor/CompositeExtractor.php | 17 +- .../Extractor/TrackingExtractorInterface.php | 17 +- .../Tracking/Tracker/CompositeTracker.php | 23 +- .../Tracking/Tracker/TrackerInterface.php | 17 +- src/CoreShop/Component/User/Model/User.php | 17 +- .../User/Model/UserAwareInterface.php | 17 +- .../Component/User/Model/UserInterface.php | 17 +- .../Repository/UserRepositoryInterface.php | 17 +- .../Component/Variant/AttributeCollector.php | 19 +- .../Variant/AttributeCollectorInterface.php | 17 +- .../Component/Variant/Model/Attribute.php | 17 +- .../Variant/Model/AttributeColor.php | 17 +- .../Variant/Model/AttributeColorInterface.php | 11 - .../Variant/Model/AttributeGroup.php | 17 +- .../Variant/Model/AttributeGroupInterface.php | 11 - .../Variant/Model/AttributeInterface.php | 11 - .../Variant/Model/AttributeValue.php | 17 +- .../Variant/Model/AttributeValueInterface.php | 18 +- .../Model/ProductVariantAwareInterface.php | 11 - .../Variant/Model/ProductVariantTrait.php | 42 +- .../Model/Resolved/ResolvedAttribute.php | 20 +- .../Model/Resolved/ResolvedAttributeGroup.php | 22 +- .../Variant/Model/Resolved/ResolvedIndex.php | 20 +- .../Component/Wishlist/Model/Wishlist.php | 17 +- .../Wishlist/Model/WishlistInterface.php | 17 +- .../Component/Wishlist/Model/WishlistItem.php | 17 +- .../Wishlist/Model/WishlistItemInterface.php | 17 +- .../Model/WishlistProductInterface.php | 18 +- .../WishlistItemRepositoryInterface.php | 19 +- .../WishlistRepositoryInterface.php | 17 +- .../Wishlist/Wishlist/WishlistModifier.php | 27 +- .../Component/Wishlist/WishlistEvents.php | 17 +- src/Kernel.php | 14 +- 2311 files changed, 27341 insertions(+), 19232 deletions(-) diff --git a/composer.json b/composer.json index 95d115d682..5221ba5848 100644 --- a/composer.json +++ b/composer.json @@ -107,22 +107,22 @@ }, "require-dev": { "behat/behat": "^3.8", - "friends-of-behat/symfony-extension": "^2.1", + "behat/mink": "^1.8", + "dbrekelmans/bdi": "^0.3.0", + "friends-of-behat/mink-debug-extension": "^2.0", + "friends-of-behat/mink-extension": "^2.4", "friends-of-behat/page-object-extension": "^0.3.2", + "friends-of-behat/symfony-extension": "^2.1", + "lakion/mink-debug-extension": "^2.0", "phpstan/phpstan": "^1.5.4", "phpstan/phpstan-doctrine": "^1.3.2", "phpstan/phpstan-symfony": "^1.1.8", "phpstan/phpstan-webmozart-assert": "^1.1.2", - "behat/mink": "^1.8", - "friends-of-behat/mink-extension": "^2.4", - "lakion/mink-debug-extension": "^2.0", - "friends-of-behat/mink-debug-extension": "^2.0", "phpunit/phpunit": "^9.5", "robertfausk/behat-panther-extension": "^1.0", "symfony/panther": "^1.0", - "dbrekelmans/bdi": "^0.3.0", - "vimeo/psalm": "^4.10", - "symplify/easy-coding-standard": "^9.4" + "symplify/easy-coding-standard": "^11.1", + "vimeo/psalm": "^4.10" }, "conflict": { }, diff --git a/ecs.php b/ecs.php index 7ad8357464..925f229946 100644 --- a/ecs.php +++ b/ecs.php @@ -39,6 +39,7 @@ use PhpCsFixer\Fixer\Comment\NoEmptyCommentFixer; use PhpCsFixer\Fixer\Comment\NoTrailingWhitespaceInCommentFixer; use PhpCsFixer\Fixer\Comment\SingleLineCommentStyleFixer; +use PhpCsFixer\Fixer\Comment\HeaderCommentFixer; use PhpCsFixer\Fixer\ConstantNotation\NativeConstantInvocationFixer; use PhpCsFixer\Fixer\ControlStructure\ElseifFixer; use PhpCsFixer\Fixer\ControlStructure\IncludeFixer; @@ -78,6 +79,7 @@ use PhpCsFixer\Fixer\Operator\IncrementStyleFixer; use PhpCsFixer\Fixer\Operator\NewWithBracesFixer; use PhpCsFixer\Fixer\Operator\ObjectOperatorWithoutWhitespaceFixer; +use PhpCsFixer\Fixer\Operator\OperatorLinebreakFixer; use PhpCsFixer\Fixer\Operator\StandardizeNotEqualsFixer; use PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer; use PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer; @@ -107,6 +109,7 @@ use PhpCsFixer\Fixer\PhpTag\NoClosingTagFixer; use PhpCsFixer\Fixer\PhpUnit\PhpUnitDedicateAssertFixer; use PhpCsFixer\Fixer\PhpUnit\PhpUnitFqcnAnnotationFixer; +use PhpCsFixer\Fixer\Semicolon\MultilineWhitespaceBeforeSemicolonsFixer; use PhpCsFixer\Fixer\Semicolon\NoEmptyStatementFixer; use PhpCsFixer\Fixer\Semicolon\NoSinglelineWhitespaceBeforeSemicolonsFixer; use PhpCsFixer\Fixer\Semicolon\SpaceAfterSemicolonFixer; @@ -121,259 +124,148 @@ use PhpCsFixer\Fixer\Whitespace\NoTrailingWhitespaceFixer; use PhpCsFixer\Fixer\Whitespace\NoWhitespaceInBlankLineFixer; use PhpCsFixer\Fixer\Whitespace\SingleBlankLineAtEofFixer; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - -return static function (ContainerConfigurator $containerConfigurator): void { - $services = $containerConfigurator->services(); - - $services->set(EregToPregFixer::class); - - $services->set(NoAliasFunctionsFixer::class); - - $services->set(PowToExponentiationFixer::class); - - $services->set(NoMixedEchoPrintFixer::class) - ->call('configure', [['use' => 'echo']]); - - $services->set(ArraySyntaxFixer::class) - ->call('configure', [['syntax' => 'short']]); - - $services->set(NoMultilineWhitespaceAroundDoubleArrowFixer::class); - - $services->set(NormalizeIndexBraceFixer::class); - - $services->set(NoTrailingCommaInSinglelineArrayFixer::class); - - $services->set(NoWhitespaceBeforeCommaInArrayFixer::class); - - $services->set(TrailingCommaInMultilineFixer::class) - ->call('configure', [['elements' => ['arrays']]]); - - $services->set(TrimArraySpacesFixer::class); - - $services->set(WhitespaceAfterCommaInArrayFixer::class); - - $services->set(BracesFixer::class) - ->call('configure', [['allow_single_line_closure' => true]]); - - $services->set(EncodingFixer::class); - - $services->set(NonPrintableCharacterFixer::class); - - $services->set(ConstantCaseFixer::class) - ->call('configure', [['case' => 'lower']]); - - $services->set(LowercaseKeywordsFixer::class); - - $services->set(LowercaseStaticReferenceFixer::class); - - $services->set(MagicConstantCasingFixer::class); - - $services->set(NativeFunctionCasingFixer::class); - - $services->set(CastSpacesFixer::class) - ->call('configure', [['space' => 'none']]); - - $services->set(LowercaseCastFixer::class); - - $services->set(ModernizeTypesCastingFixer::class); - - $services->set(NoShortBoolCastFixer::class); - - $services->set(ShortScalarCastFixer::class); - - $services->set(ClassAttributesSeparationFixer::class); - - $services->set(ClassDefinitionFixer::class) - ->call('configure', [['single_item_single_line' => true, 'multi_line_extends_each_single_line' => true]]); - - $services->set(NoBlankLinesAfterClassOpeningFixer::class); - - $services->set(NoNullPropertyInitializationFixer::class); - - $services->set(NoPhp4ConstructorFixer::class); - - $services->set(NoUnneededFinalMethodFixer::class); - - $services->set(ProtectedToPrivateFixer::class); - - $services->set(SelfAccessorFixer::class); - - $services->set(SingleClassElementPerStatementFixer::class); - - $services->set(VisibilityRequiredFixer::class) - ->call('configure', [['elements' => ['const', 'property', 'method']]]); - - $services->set(NoEmptyCommentFixer::class); - - $services->set(NoTrailingWhitespaceInCommentFixer::class); - - $services->set(SingleLineCommentStyleFixer::class) - ->call('configure', [['comment_types' => ['hash']]]); - - $services->set(ElseifFixer::class); - - $services->set(IncludeFixer::class); - - $services->set(NoBreakCommentFixer::class); - - $services->set(NoSuperfluousElseifFixer::class); - - $services->set(NoTrailingCommaInListCallFixer::class); - - $services->set(NoUnneededControlParenthesesFixer::class); - - $services->set(NoUnneededCurlyBracesFixer::class); - - $services->set(NoUselessElseFixer::class); - - $services->set(SwitchCaseSemicolonToColonFixer::class); - - $services->set(SwitchCaseSpaceFixer::class); - - $services->set(NativeConstantInvocationFixer::class); - - $services->set(FunctionDeclarationFixer::class); - - $services->set(FunctionTypehintSpaceFixer::class); - - $services->set(MethodArgumentSpaceFixer::class); - - $services->set(NoSpacesAfterFunctionNameFixer::class); - - $services->set(ReturnTypeDeclarationFixer::class); - - $services->set(NoLeadingImportSlashFixer::class); - - $services->set(NoUnusedImportsFixer::class); - - $services->set(OrderedImportsFixer::class); - - $services->set(SingleImportPerStatementFixer::class); - - $services->set(SingleLineAfterImportsFixer::class); - - $services->set(CombineConsecutiveIssetsFixer::class); - - $services->set(CombineConsecutiveUnsetsFixer::class); - - $services->set(DeclareEqualNormalizeFixer::class); - - $services->set(DirConstantFixer::class); - - $services->set(FunctionToConstantFixer::class); - - $services->set(IsNullFixer::class); - - $services->set(ErrorSuppressionFixer::class); - - $services->set(ListSyntaxFixer::class) - ->call('configure', [['syntax' => 'short']]); - - $services->set(BlankLineAfterNamespaceFixer::class); - - $services->set(NoLeadingNamespaceWhitespaceFixer::class); - - $services->set(SingleBlankLineBeforeNamespaceFixer::class); - - $services->set(NoHomoglyphNamesFixer::class); - - $services->set(BinaryOperatorSpacesFixer::class); - - $services->set(ConcatSpaceFixer::class) - ->call('configure', [['spacing' => 'one']]); - - $services->set(NewWithBracesFixer::class); - - $services->set(ObjectOperatorWithoutWhitespaceFixer::class); - - $services->set(IncrementStyleFixer::class) - ->call('configure', [['style' => 'pre']]); - - $services->set(StandardizeNotEqualsFixer::class); - - $services->set(TernaryOperatorSpacesFixer::class); - - $services->set(TernaryToNullCoalescingFixer::class); - - $services->set(UnaryOperatorSpacesFixer::class); - - $services->set(NoBlankLinesAfterPhpdocFixer::class); - - $services->set(NoEmptyPhpdocFixer::class); - - $services->set(NoSuperfluousPhpdocTagsFixer::class) - ->call('configure', [['allow_mixed' => true]]); - - $services->set(PhpdocIndentFixer::class); - - $services->set(GeneralPhpdocTagRenameFixer::class); - $services->set(PhpdocInlineTagNormalizerFixer::class); - $services->set(PhpdocTagTypeFixer::class); - - $services->set(PhpdocNoAccessFixer::class); - - $services->set(PhpdocNoAliasTagFixer::class); - - $services->set(PhpdocNoEmptyReturnFixer::class); - - $services->set(PhpdocNoPackageFixer::class); - - $services->set(PhpdocNoUselessInheritdocFixer::class); - - $services->set(PhpdocReturnSelfReferenceFixer::class); - - $services->set(PhpdocScalarFixer::class); - - $services->set(PhpdocSeparationFixer::class); - - $services->set(PhpdocSingleLineVarSpacingFixer::class); - - $services->set(PhpdocTrimFixer::class); - - $services->set(PhpdocTypesFixer::class); - - $services->set(PhpdocTypesOrderFixer::class) - ->call('configure', [['null_adjustment' => 'always_last', 'sort_algorithm' => 'none']]); - - $services->set(PhpdocVarWithoutNameFixer::class); - - $services->set(BlankLineAfterOpeningTagFixer::class); - - $services->set(FullOpeningTagFixer::class); - - $services->set(NoClosingTagFixer::class); - - $services->set(PhpUnitDedicateAssertFixer::class); - - $services->set(PhpUnitFqcnAnnotationFixer::class); - - $services->set(NoEmptyStatementFixer::class); - - $services->set(NoSinglelineWhitespaceBeforeSemicolonsFixer::class); - - $services->set(SpaceAfterSemicolonFixer::class); - - $services->set(DeclareStrictTypesFixer::class); - - $services->set(SingleQuoteFixer::class); - - $services->set(BlankLineBeforeStatementFixer::class); - - $services->set(IndentationTypeFixer::class); - - $services->set(LineEndingFixer::class); - - $services->set(NoExtraBlankLinesFixer::class) - ->call('configure', [['tokens' => ['break', 'case', 'continue', 'curly_brace_block', 'default', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'switch', 'throw', 'use']]]); - - $services->set(NoSpacesAroundOffsetFixer::class); - - $services->set(NoSpacesInsideParenthesisFixer::class); - - $services->set(NoTrailingWhitespaceFixer::class); - - $services->set(NoWhitespaceInBlankLineFixer::class); - - $services->set(SingleBlankLineAtEofFixer::class); +use Symplify\EasyCodingStandard\Config\ECSConfig; + +return static function (ECSConfig $ecsConfig): void { + $ecsConfig->rules([ + BinaryOperatorSpacesFixer::class, + BlankLineAfterNamespaceFixer::class, + BlankLineAfterOpeningTagFixer::class, + BlankLineBeforeStatementFixer::class, + CastSpacesFixer::class, + ClassAttributesSeparationFixer::class, + CombineConsecutiveIssetsFixer::class, + CombineConsecutiveUnsetsFixer::class, + DeclareEqualNormalizeFixer::class, + DeclareStrictTypesFixer::class, + DirConstantFixer::class, + ElseifFixer::class, + EncodingFixer::class, + EregToPregFixer::class, + ErrorSuppressionFixer::class, + FullOpeningTagFixer::class, + FunctionDeclarationFixer::class, + FunctionToConstantFixer::class, + FunctionTypehintSpaceFixer::class, + GeneralPhpdocTagRenameFixer::class, + IncludeFixer::class, + IndentationTypeFixer::class, + IsNullFixer::class, + LineEndingFixer::class, + LowercaseCastFixer::class, + LowercaseKeywordsFixer::class, + LowercaseStaticReferenceFixer::class, + MagicConstantCasingFixer::class, + MethodArgumentSpaceFixer::class, + ModernizeTypesCastingFixer::class, + NativeConstantInvocationFixer::class, + NativeFunctionCasingFixer::class, + NewWithBracesFixer::class, + NoAliasFunctionsFixer::class, + NoBlankLinesAfterClassOpeningFixer::class, + NoBlankLinesAfterPhpdocFixer::class, + NoBreakCommentFixer::class, + NoClosingTagFixer::class, + NoEmptyCommentFixer::class, + NoEmptyPhpdocFixer::class, + NoEmptyStatementFixer::class, + NoHomoglyphNamesFixer::class, + NoLeadingImportSlashFixer::class, + NoLeadingNamespaceWhitespaceFixer::class, + NoMultilineWhitespaceAroundDoubleArrowFixer::class, + NonPrintableCharacterFixer::class, + NoNullPropertyInitializationFixer::class, + NoPhp4ConstructorFixer::class, + NormalizeIndexBraceFixer::class, + NoShortBoolCastFixer::class, + NoSinglelineWhitespaceBeforeSemicolonsFixer::class, + NoSpacesAfterFunctionNameFixer::class, + NoSpacesAroundOffsetFixer::class, + NoSpacesInsideParenthesisFixer::class, + NoSuperfluousElseifFixer::class, + NoTrailingCommaInListCallFixer::class, + NoTrailingCommaInSinglelineArrayFixer::class, + NoTrailingWhitespaceFixer::class, + NoTrailingWhitespaceInCommentFixer::class, + NoUnneededControlParenthesesFixer::class, + NoUnneededCurlyBracesFixer::class, + NoUnneededFinalMethodFixer::class, + NoUnusedImportsFixer::class, + NoUselessElseFixer::class, + NoWhitespaceBeforeCommaInArrayFixer::class, + NoWhitespaceInBlankLineFixer::class, + ObjectOperatorWithoutWhitespaceFixer::class, + OrderedImportsFixer::class, + PhpdocIndentFixer::class, + PhpdocInlineTagNormalizerFixer::class, + PhpdocNoAccessFixer::class, + PhpdocNoAliasTagFixer::class, + PhpdocNoEmptyReturnFixer::class, + PhpdocNoPackageFixer::class, + PhpdocNoUselessInheritdocFixer::class, + PhpdocReturnSelfReferenceFixer::class, + PhpdocScalarFixer::class, + PhpdocSeparationFixer::class, + PhpdocSingleLineVarSpacingFixer::class, + PhpdocTagTypeFixer::class, + PhpdocTrimFixer::class, + PhpdocTypesFixer::class, + PhpdocVarWithoutNameFixer::class, + PhpUnitDedicateAssertFixer::class, + PhpUnitFqcnAnnotationFixer::class, + PowToExponentiationFixer::class, + ProtectedToPrivateFixer::class, + ReturnTypeDeclarationFixer::class, + SelfAccessorFixer::class, + ShortScalarCastFixer::class, + SingleBlankLineAtEofFixer::class, + SingleBlankLineBeforeNamespaceFixer::class, + SingleClassElementPerStatementFixer::class, + SingleImportPerStatementFixer::class, + SingleLineAfterImportsFixer::class, + SingleQuoteFixer::class, + SpaceAfterSemicolonFixer::class, + StandardizeNotEqualsFixer::class, + SwitchCaseSemicolonToColonFixer::class, + SwitchCaseSpaceFixer::class, + TernaryOperatorSpacesFixer::class, + TernaryToNullCoalescingFixer::class, + TrimArraySpacesFixer::class, + UnaryOperatorSpacesFixer::class, + WhitespaceAfterCommaInArrayFixer::class, + \Symplify\CodingStandard\Fixer\Spacing\StandaloneLineConstructorParamFixer::class + ]); + + $ecsConfig->ruleWithConfiguration(ArraySyntaxFixer::class, ['syntax' => 'short']); + $ecsConfig->ruleWithConfiguration(BracesFixer::class, ['allow_single_line_closure' => true]); + $ecsConfig->ruleWithConfiguration(ClassDefinitionFixer::class, ['single_item_single_line' => true, 'multi_line_extends_each_single_line' => true]); + $ecsConfig->ruleWithConfiguration(ConcatSpaceFixer::class, ['spacing' => 'one']); + $ecsConfig->ruleWithConfiguration(ConstantCaseFixer::class, ['case' => 'lower']); + $ecsConfig->ruleWithConfiguration(IncrementStyleFixer::class, ['style' => 'pre']); + $ecsConfig->ruleWithConfiguration(ListSyntaxFixer::class, ['syntax' => 'short']); + $ecsConfig->ruleWithConfiguration(MultilineWhitespaceBeforeSemicolonsFixer::class, ['strategy' => 'new_line_for_chained_calls']); + $ecsConfig->ruleWithConfiguration(NoExtraBlankLinesFixer::class, ['tokens' => ['break', 'case', 'continue', 'curly_brace_block', 'default', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'switch', 'throw', 'use']]); + $ecsConfig->ruleWithConfiguration(NoMixedEchoPrintFixer::class, ['use' => 'echo']); + $ecsConfig->ruleWithConfiguration(NoSuperfluousPhpdocTagsFixer::class, ['allow_mixed' => true]); + $ecsConfig->ruleWithConfiguration(OperatorLinebreakFixer::class, ['only_booleans' => true, 'position' => 'end']); + $ecsConfig->ruleWithConfiguration(PhpdocTypesOrderFixer::class, ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none']); + $ecsConfig->ruleWithConfiguration(SingleLineCommentStyleFixer::class, ['comment_types' => ['hash']]); + $ecsConfig->ruleWithConfiguration(TrailingCommaInMultilineFixer::class, ['elements' => ['arrays', 'arguments', 'parameters']]); + $ecsConfig->ruleWithConfiguration(VisibilityRequiredFixer::class, ['elements' => ['const', 'property', 'method']]); + + $header = <<ruleWithConfiguration(HeaderCommentFixer::class, ['header' => $header]); }; diff --git a/src/AppKernel.php b/src/AppKernel.php index 5cdb73a596..7553c68fd8 100644 --- a/src/AppKernel.php +++ b/src/AppKernel.php @@ -1,15 +1,19 @@ kernel, - $this->kernel->getContainer()->get(CommandDirectoryChecker::class) + $this->kernel->getContainer()->get(CommandDirectoryChecker::class), ); $this->application = new Application($this->kernel); @@ -63,7 +66,7 @@ public function iRunCoreShopInstallSampleDataCommand(): void { $installCommand = new InstallDemoCommand( $this->kernel, - $this->kernel->getContainer()->get(CommandDirectoryChecker::class) + $this->kernel->getContainer()->get(CommandDirectoryChecker::class), ); $this->application = new Application($this->kernel); diff --git a/src/CoreShop/Behat/Context/Domain/CartContext.php b/src/CoreShop/Behat/Context/Domain/CartContext.php index cf167005a1..9be8e54a42 100644 --- a/src/CoreShop/Behat/Context/Domain/CartContext.php +++ b/src/CoreShop/Behat/Context/Domain/CartContext.php @@ -1,17 +1,20 @@ cartContext->getCart()->getItems()) - ) + count($this->cartContext->getCart()->getItems()), + ), ); } @@ -57,8 +60,8 @@ public function thereShouldBeTwoProductsInTheCart(): void 2, sprintf( 'There should be only two products in the cart, but found %d', - count($this->cartContext->getCart()->getItems()) - ) + count($this->cartContext->getCart()->getItems()), + ), ); } @@ -82,8 +85,8 @@ public function theProductShouldNotBeInMyCart(ProductInterface $product): void $foundItem, sprintf( 'Product %s found in cart', - $product->getName() - ) + $product->getName(), + ), ); } @@ -113,8 +116,8 @@ public function theProductShouldBeInMyCart(ProductInterface $product): void $cartItem, sprintf( 'Product %s not found in cart', - $product->getName() - ) + $product->getName(), + ), ); } @@ -144,8 +147,8 @@ public function theProductShouldBeInMyCartAsGift(ProductInterface $product): voi $cartItem ? $cartItem->getIsGiftItem() : false, sprintf( 'Product %s is not in the Cart or is not a gift', - $product->getName() - ) + $product->getName(), + ), ); } @@ -160,8 +163,8 @@ public function cartTotalShouldBeIncludingTax($total): void sprintf( 'Cart total is expected to be %s, but it is %s', $total, - $this->cartContext->getCart()->getTotal(true) - ) + $this->cartContext->getCart()->getTotal(true), + ), ); } @@ -176,8 +179,8 @@ public function cartTotalShouldBeExcludingTax($total): void sprintf( 'Cart total is expected to be %s, but it is %s', $total, - $this->cartContext->getCart()->getTotal(false) - ) + $this->cartContext->getCart()->getTotal(false), + ), ); } @@ -192,8 +195,8 @@ public function cartSubtotalShouldBeIncludingTax($total): void sprintf( 'Cart subtotal is expected to be %s, but it is %s', $total, - $this->cartContext->getCart()->getSubtotal(true) - ) + $this->cartContext->getCart()->getSubtotal(true), + ), ); } @@ -208,8 +211,8 @@ public function cartSubtotalShouldBeExcludingTax($total): void sprintf( 'Cart subtotal is expected to be %s, but it is %s', $total, - $this->cartContext->getCart()->getSubtotal(false) - ) + $this->cartContext->getCart()->getSubtotal(false), + ), ); } @@ -224,8 +227,8 @@ public function cartTotalTaxShouldBe($totalTax): void sprintf( 'Cart total is expected to be %s, but it is %s', $totalTax, - $this->cartContext->getCart()->getTotalTax() - ) + $this->cartContext->getCart()->getTotalTax(), + ), ); } @@ -257,8 +260,8 @@ public function cartItemTaxesShouldBe($totalTax): void sprintf( 'Cart item taxes is expected to be %s, but it is %s', $totalTax, - $itemTaxesTotal - ) + $itemTaxesTotal, + ), ); } @@ -280,8 +283,8 @@ public function cartShouldWeigh($kg): void sprintf( 'Cart is expected to weigh %skg, but it weighs %skg', $kg, - $cart->getWeight() - ) + $cart->getWeight(), + ), ); } @@ -300,8 +303,8 @@ public function cartShippingCostShouldBeExcludingTax($shipping): void sprintf( 'Cart shipping is expected to be %s, but it is %s', $shipping, - $cart->getShipping(false) - ) + $cart->getShipping(false), + ), ); } @@ -320,8 +323,8 @@ public function cartShippingCostShouldBeIncludingTax($shipping): void sprintf( 'Cart shipping is expected to be %s, but it is %s', $shipping, - $cart->getShipping(true) - ) + $cart->getShipping(true), + ), ); } @@ -337,8 +340,8 @@ public function cartShippingTaxRateShouldBe(OrderInterface $cart, $shippingTaxRa sprintf( 'Cart shipping is expected to be %s, but it is %s', $shippingTaxRate, - $cart->getShippingTaxRate() - ) + $cart->getShippingTaxRate(), + ), ); } @@ -357,8 +360,8 @@ public function cartShouldUseCarrier(CarrierInterface $carrier): void sprintf( 'Cart is expected to use carrier %s, but found %s', $carrier->getTitle('en'), - $cart->getCarrier()->getTitle('en') - ) + $cart->getCarrier()->getTitle('en'), + ), ); } @@ -373,7 +376,7 @@ public function cartShouldNotHaveACarrier(): void Assert::null( $cart->getCarrier(), - 'Cart is expected to not have a carrier but found one' + 'Cart is expected to not have a carrier but found one', ); } @@ -388,8 +391,8 @@ public function cartDiscountShouldBeIncludingTax($total): void sprintf( 'Cart discount is expected to be %s, but it is %s', $total, - $this->cartContext->getCart()->getDiscount(true) - ) + $this->cartContext->getCart()->getDiscount(true), + ), ); } @@ -404,8 +407,8 @@ public function cartDiscountShouldBeExcludingTax($total): void sprintf( 'Cart discount is expected to be %s, but it is %s', $total, - $this->cartContext->getCart()->getDiscount(false) - ) + $this->cartContext->getCart()->getDiscount(false), + ), ); } @@ -419,8 +422,8 @@ public function thereShouldBeNoProductInMyCart(OrderInterface $cart): void 0, sprintf( 'There should be no product in the cart, but found %d', - count($cart->getItems()) - ) + count($cart->getItems()), + ), ); } @@ -432,7 +435,7 @@ public function theFirstItemInMyCartShouldHaveUnit(OrderInterface $cart, Product Assert::minCount( $cart->getItems(), 1, - 'Expected to be at least 1 item in the cart, but found none' + 'Expected to be at least 1 item in the cart, but found none', ); /** @@ -442,7 +445,7 @@ public function theFirstItemInMyCartShouldHaveUnit(OrderInterface $cart, Product Assert::notNull( $item->getUnitDefinition(), - 'Expected first cart item to have a unit-definition, but it did not' + 'Expected first cart item to have a unit-definition, but it did not', ); Assert::eq( @@ -451,8 +454,8 @@ public function theFirstItemInMyCartShouldHaveUnit(OrderInterface $cart, Product sprintf( 'Expected cart item to have unit %s, but found %s', $item->getUnitDefinition()->getUnitName(), - $unit->getName() - ) + $unit->getName(), + ), ); } @@ -464,7 +467,7 @@ public function theSecondItemInMyCartShouldHaveUnit(OrderInterface $cart, Produc Assert::minCount( $cart->getItems(), 2, - sprintf('Expected to be at least 2 items in the cart, but found %s', count($cart->getItems())) + sprintf('Expected to be at least 2 items in the cart, but found %s', count($cart->getItems())), ); /** @@ -474,7 +477,7 @@ public function theSecondItemInMyCartShouldHaveUnit(OrderInterface $cart, Produc Assert::notNull( $item->getUnitDefinition(), - 'Expected first cart item to have a unit-definition, but it did not' + 'Expected first cart item to have a unit-definition, but it did not', ); Assert::eq( @@ -483,8 +486,8 @@ public function theSecondItemInMyCartShouldHaveUnit(OrderInterface $cart, Produc sprintf( 'Expected cart item to have unit %s, but found %s', $item->getUnitDefinition()->getUnitName(), - $unit->getName() - ) + $unit->getName(), + ), ); } @@ -498,7 +501,7 @@ public function thereShouldBeCartFormViolation(FormInterface $addToCartForm, $me foreach ($addToCartForm->getErrors(true, true) as $error) { Assert::eq( $error->getMessage(), - $message + $message, ); } } @@ -518,7 +521,7 @@ public function theCartItemWithProductShouldHaveADiscountPriceWithTax(ProductInt Assert::eq( $cartItem->getItemDiscountPrice(true), - $price + $price, ); } @@ -537,7 +540,7 @@ public function theCartItemWithProductShouldHaveADiscountPriceWithoutTax(Product Assert::eq( $cartItem->getItemDiscountPrice(false), - $price + $price, ); } @@ -556,7 +559,7 @@ public function theCartItemWithProductShouldHaveADiscountWithTax(ProductInterfac Assert::eq( $cartItem->getItemDiscount(true), - $price + $price, ); } @@ -575,7 +578,7 @@ public function theCartItemWithProductShouldHaveADiscountWithoutTax(ProductInter Assert::eq( $cartItem->getItemDiscount(false), - $price + $price, ); } @@ -594,7 +597,7 @@ public function theCartItemWithProductShouldHaveATotalWithTax(ProductInterface $ Assert::eq( $cartItem->getTotal(true), - $price + $price, ); } @@ -613,7 +616,7 @@ public function theCartItemWithProductShouldHaveATotalWithoutTax(ProductInterfac Assert::eq( $cartItem->getTotal(false), - $price + $price, ); } @@ -632,7 +635,7 @@ public function theCartItemWithProductShouldHaveARetailWithTax(ProductInterface Assert::eq( $cartItem->getItemRetailPrice(true), - $price + $price, ); } @@ -651,7 +654,7 @@ public function theCartItemWithProductShouldHaveARetalWithoutTax(ProductInterfac Assert::eq( $cartItem->getItemRetailPrice(false), - $price + $price, ); } @@ -670,7 +673,7 @@ public function theCartItemWithProductShouldHaveAConvertedDiscountPriceWithTax(P Assert::eq( $cartItem->getConvertedItemDiscountPrice(true), - $price + $price, ); } @@ -689,7 +692,7 @@ public function theCartItemWithProductShouldHaveAConvertedDiscountPriceWithoutTa Assert::eq( $cartItem->getConvertedItemDiscountPrice(false), - $price + $price, ); } @@ -708,7 +711,7 @@ public function theCartItemWithProductShouldHaveAConvertedDiscountWithTax(Produc Assert::eq( $cartItem->getConvertedItemDiscount(true), - $price + $price, ); } @@ -727,7 +730,7 @@ public function theCartItemWithProductShouldHaveAConvertedDiscountWithoutTax(Pro Assert::eq( $cartItem->getConvertedItemDiscount(false), - $price + $price, ); } @@ -746,7 +749,7 @@ public function theCartItemWithProductShouldHaveConvertedATotalWithTax(ProductIn Assert::eq( $cartItem->getConvertedTotal(true), - $price + $price, ); } @@ -765,7 +768,7 @@ public function theCartItemWithProductShouldHaveAConvertedTotalWithoutTax(Produc Assert::eq( $cartItem->getConvertedTotal(false), - $price + $price, ); } @@ -784,7 +787,7 @@ public function theCartItemWithProductShouldHaveAConvertedRetailWithTax(ProductI Assert::eq( $cartItem->getConvertedItemRetailPrice(true), - $price + $price, ); } @@ -803,7 +806,7 @@ public function theCartItemWithProductShouldHaveAConvertedRetalWithoutTax(Produc Assert::eq( $cartItem->getConvertedItemRetailPrice(false), - $price + $price, ); } @@ -822,8 +825,8 @@ public function cartConvertedShippingCostShouldBeExcludingTax($shipping): void sprintf( 'Cart shipping is expected to be %s, but it is %s', $shipping, - $cart->getConvertedShipping(false) - ) + $cart->getConvertedShipping(false), + ), ); } @@ -842,8 +845,8 @@ public function cartConvertedShippingCostShouldBeIncludingTax($shipping): void sprintf( 'Cart shipping is expected to be %s, but it is %s', $shipping, - $cart->getConvertedShipping(true) - ) + $cart->getConvertedShipping(true), + ), ); } diff --git a/src/CoreShop/Behat/Context/Domain/CartPriceRuleContext.php b/src/CoreShop/Behat/Context/Domain/CartPriceRuleContext.php index c4a06ff7df..82f7fa6939 100644 --- a/src/CoreShop/Behat/Context/Domain/CartPriceRuleContext.php +++ b/src/CoreShop/Behat/Context/Domain/CartPriceRuleContext.php @@ -1,17 +1,20 @@ getParent()->getId(), $parent->getId(), - sprintf('%d should have the same id as the assumed parent %d', $child->getParent()->getId(), $parent->getId()) + sprintf('%d should have the same id as the assumed parent %d', $child->getParent()->getId(), $parent->getId()), ); } diff --git a/src/CoreShop/Behat/Context/Domain/CountryContext.php b/src/CoreShop/Behat/Context/Domain/CountryContext.php index 02fe953050..b3ff4d1f63 100644 --- a/src/CoreShop/Behat/Context/Domain/CountryContext.php +++ b/src/CoreShop/Behat/Context/Domain/CountryContext.php @@ -1,17 +1,20 @@ getName(), $currency->getIsoCode(), - $country->getCurrency()->getIsoCode() - ) + $country->getCurrency()->getIsoCode(), + ), ); } @@ -77,8 +84,8 @@ public function iShouldBeInCountry(CountryInterface $country): void $country->getName(), $country->getId(), $actualCountry->getName(), - $actualCountry->getId() - ) + $actualCountry->getId(), + ), ); } @@ -95,8 +102,8 @@ public function theAddressShouldFormatTo(AddressInterface $address, $formattedAd sprintf( 'expected the address to be formatted like "%s" but got "%s" instead.', $formattedAddress, - $actualFormattedAddress - ) + $actualFormattedAddress, + ), ); } @@ -114,7 +121,7 @@ public function whenIcheckTheGeoLiteResolver($ipAddress, $countryIso): void [], [ 'REMOTE_ADDR' => $ipAddress, - ] + ], ); $country = $this->geoLiteResolver->findCountry($request); diff --git a/src/CoreShop/Behat/Context/Domain/CurrencyContext.php b/src/CoreShop/Behat/Context/Domain/CurrencyContext.php index 48fbf2b02b..1d229747ea 100644 --- a/src/CoreShop/Behat/Context/Domain/CurrencyContext.php +++ b/src/CoreShop/Behat/Context/Domain/CurrencyContext.php @@ -1,17 +1,20 @@ getIsoCode(), - $this->currencyContext->getCurrency()->getIsoCode() - ) + $this->currencyContext->getCurrency()->getIsoCode(), + ), ); } @@ -53,12 +59,12 @@ public function theStoreShouldHaveXCurrencies(StoreInterface $store, $countOfCur Assert::same( count($validCurrencies), - (int)$countOfCurrencies, + (int) $countOfCurrencies, sprintf( 'Found "%s" valid currencies instead of of "%s"', count($validCurrencies), - (int)$countOfCurrencies - ) + (int) $countOfCurrencies, + ), ); } @@ -67,7 +73,7 @@ public function theStoreShouldHaveXCurrencies(StoreInterface $store, $countOfCur */ public function currencyShouldBeFormatted($amount, CurrencyInterface $currency, $locale, $shouldBeFormat): void { - $format = $this->moneyFormatter->format((int)$amount, $currency->getIsoCode(), $locale); + $format = $this->moneyFormatter->format((int) $amount, $currency->getIsoCode(), $locale); Assert::eq( $format, @@ -75,8 +81,8 @@ public function currencyShouldBeFormatted($amount, CurrencyInterface $currency, sprintf( 'Given format "%s" is different from actual format "%s"', $shouldBeFormat, - $format - ) + $format, + ), ); } } diff --git a/src/CoreShop/Behat/Context/Domain/CustomerContext.php b/src/CoreShop/Behat/Context/Domain/CustomerContext.php index f890ff9031..87e587f100 100644 --- a/src/CoreShop/Behat/Context/Domain/CustomerContext.php +++ b/src/CoreShop/Behat/Context/Domain/CustomerContext.php @@ -1,17 +1,20 @@ getEmail(), - $this->customerContext->getCustomer()->getEmail() - ) + $this->customerContext->getCustomer()->getEmail(), + ), ); } diff --git a/src/CoreShop/Behat/Context/Domain/CustomerGroupContext.php b/src/CoreShop/Behat/Context/Domain/CustomerGroupContext.php index ab38e89467..b7138c9dc8 100644 --- a/src/CoreShop/Behat/Context/Domain/CustomerGroupContext.php +++ b/src/CoreShop/Behat/Context/Domain/CustomerGroupContext.php @@ -1,17 +1,20 @@ currencyConverter->convert((int)$fromPrice, $fromCurrency->getIsoCode(), $toCurrency->getIsoCode()), - (int)$toPrice, + $this->currencyConverter->convert((int) $fromPrice, $fromCurrency->getIsoCode(), $toCurrency->getIsoCode()), + (int) $toPrice, sprintf( 'Given exchanged value (%s %s) is different from actual value (%s %s)', $fromPrice, $fromCurrency->getIsoCode(), $toPrice, - $toCurrency->getIsoCode() - ) + $toCurrency->getIsoCode(), + ), ); } } diff --git a/src/CoreShop/Behat/Context/Domain/FilterContext.php b/src/CoreShop/Behat/Context/Domain/FilterContext.php index 369db14a18..9bd7a4b1dd 100644 --- a/src/CoreShop/Behat/Context/Domain/FilterContext.php +++ b/src/CoreShop/Behat/Context/Domain/FilterContext.php @@ -1,17 +1,20 @@ getConditions()), $count, - sprintf('%d Filters have been found with name "%s".', count($filter->getConditions()), $filter->getName()) + sprintf('%d Filters have been found with name "%s".', count($filter->getConditions()), $filter->getName()), ); } @@ -69,7 +75,7 @@ public function theFilterShouldHaveFollowingValuesForSelect( FilterInterface $filter, $conditionType, $field, - TableNode $values + TableNode $values, ): void { $conditions = $this->prepareFilter($filter); $shouldHaveConditions = []; @@ -82,7 +88,7 @@ public function theFilterShouldHaveFollowingValuesForSelect( $filter->getConditions()->toArray(), static function (FilterConditionInterface $condition) use ($field) { return $condition->getConfiguration()['field'] === $field; - } + }, ); $field = reset($filtered); @@ -96,7 +102,7 @@ static function (FilterConditionInterface $condition) use ($field) { function ($value) { return $value['value']; }, - $conditions[$field->getId()]['values'] + $conditions[$field->getId()]['values'], ); $diff = array_diff($shouldHaveConditions, $values); @@ -113,7 +119,7 @@ public function theFilterShouldHaveXValuesWithCountXForTypeAndField( $countOfValues, $countPerValue, $conditionType, - $field + $field, ): void { $conditions = $this->prepareFilter($filter); @@ -121,7 +127,7 @@ public function theFilterShouldHaveXValuesWithCountXForTypeAndField( $filter->getConditions()->toArray(), static function (FilterConditionInterface $condition) use ($field) { return $condition->getConfiguration()['field'] === $field; - } + }, ); $field = reset($filtered); @@ -135,7 +141,7 @@ static function (FilterConditionInterface $condition) use ($field) { function ($value) { return $value['count']; }, - $conditions[$field->getId()]['values'] + $conditions[$field->getId()]['values'], ); Assert::eq($values[0], $countPerValue); diff --git a/src/CoreShop/Behat/Context/Domain/IndexConditionContext.php b/src/CoreShop/Behat/Context/Domain/IndexConditionContext.php index 900f85e1c0..d97e1d49fc 100644 --- a/src/CoreShop/Behat/Context/Domain/IndexConditionContext.php +++ b/src/CoreShop/Behat/Context/Domain/IndexConditionContext.php @@ -1,17 +1,20 @@ getId())); Assert::same( - (int)$productEntry['o_id'], + (int) $productEntry['o_id'], $object->getId(), sprintf( 'Expected to find id %s in index but found %s instead', - (int)$productEntry['o_id'], - $object->getId() - ) + (int) $productEntry['o_id'], + $object->getId(), + ), ); } @@ -200,8 +205,7 @@ private function indexEntryShouldHaveValue(IndexInterface $index, IndexableInter $column, $value, get_debug_type($value), - - ) + ), ); } diff --git a/src/CoreShop/Behat/Context/Domain/LinkGeneratorContext.php b/src/CoreShop/Behat/Context/Domain/LinkGeneratorContext.php index 33ceb4c09f..ecd5531b54 100644 --- a/src/CoreShop/Behat/Context/Domain/LinkGeneratorContext.php +++ b/src/CoreShop/Behat/Context/Domain/LinkGeneratorContext.php @@ -1,17 +1,20 @@ notificationRuleListener->hasBeenFired($type), sprintf( 'Expected that the notification rule for type "%s" has been fired.', - $type - ) + $type, + ), ); } } diff --git a/src/CoreShop/Behat/Context/Domain/OrderContext.php b/src/CoreShop/Behat/Context/Domain/OrderContext.php index 1d223444c0..6c96758088 100644 --- a/src/CoreShop/Behat/Context/Domain/OrderContext.php +++ b/src/CoreShop/Behat/Context/Domain/OrderContext.php @@ -1,17 +1,20 @@ getItems()) - ) + count($order->getItems()), + ), ); } @@ -55,8 +58,8 @@ public function orderTotalShouldBeIncludingTax(OrderInterface $order, $total): v sprintf( 'Order total is expected to be %s, but it is %s', $total, - $order->getTotal(true) - ) + $order->getTotal(true), + ), ); } @@ -71,8 +74,8 @@ public function orderTotalShouldBeExcludingTax(OrderInterface $order, $total): v sprintf( 'Order total is expected to be %s, but it is %s', $total, - $order->getTotal(false) - ) + $order->getTotal(false), + ), ); } @@ -87,8 +90,8 @@ public function orderSubtotalShouldBeIncludingTax(OrderInterface $order, $total) sprintf( 'Order subtotal is expected to be %s, but it is %s', $total, - $order->getSubtotal(true) - ) + $order->getSubtotal(true), + ), ); } @@ -103,8 +106,8 @@ public function orderSubtotalShouldBeExcludingTax(OrderInterface $order, $total) sprintf( 'Order subtotal is expected to be %s, but it is %s', $total, - $order->getSubtotal(false) - ) + $order->getSubtotal(false), + ), ); } @@ -119,8 +122,8 @@ public function orderShouldWeigh(OrderInterface $order, $kg): void sprintf( 'Order is expected to weigh %skg, but it weighs %skg', $kg, - $order->getWeight() - ) + $order->getWeight(), + ), ); } @@ -135,8 +138,8 @@ public function orderShippingShouldBeIncludingTax(OrderInterface $order, $shippi sprintf( 'Order shipping is expected to be %s, but it is %s', $shipping, - $order->getShipping(true) - ) + $order->getShipping(true), + ), ); } @@ -151,8 +154,8 @@ public function orderShippingShouldBeExcludingTax(OrderInterface $order, $shippi sprintf( 'Order shipping is expected to be %s, but it is %s', $shipping, - $order->getShipping(false) - ) + $order->getShipping(false), + ), ); } @@ -167,8 +170,8 @@ public function orderShippingTaxShouldBe(OrderInterface $order, $shippingTaxRate sprintf( 'Order shipping tax rate is expected to be %s, but it is %s', $shippingTaxRate, - $order->getShippingTaxRate() - ) + $order->getShippingTaxRate(), + ), ); } @@ -183,8 +186,8 @@ public function orderStateShouldBeState(OrderInterface $order, $state): void sprintf( 'Expected order state to be "%s", but order is in state "%s"', $state, - $order->getOrderState() - ) + $order->getOrderState(), + ), ); } @@ -199,8 +202,8 @@ public function orderPaymentStateShouldBeState(OrderInterface $order, $state): v sprintf( 'Expected payment state to be "%s", but order is in state "%s"', $state, - $order->getPaymentState() - ) + $order->getPaymentState(), + ), ); } @@ -215,8 +218,8 @@ public function orderShippingStateShouldBeState(OrderInterface $order, $state): sprintf( 'Expected shipping state to be "%s", but order is in state "%s"', $state, - $order->getShippingState() - ) + $order->getShippingState(), + ), ); } @@ -231,8 +234,8 @@ public function orderInvoiceStateShouldBeState(OrderInterface $order, $state): v sprintf( 'Expected invoice state to be "%s", but order is in state "%s"', $state, - $order->getInvoiceState() - ) + $order->getInvoiceState(), + ), ); } diff --git a/src/CoreShop/Behat/Context/Domain/PimcoreClassContext.php b/src/CoreShop/Behat/Context/Domain/PimcoreClassContext.php index 8c7d65dea3..d5895ae256 100644 --- a/src/CoreShop/Behat/Context/Domain/PimcoreClassContext.php +++ b/src/CoreShop/Behat/Context/Domain/PimcoreClassContext.php @@ -1,17 +1,20 @@ getName(), - $defaultUnitDefinition->getUnitName() - ) + $defaultUnitDefinition->getUnitName(), + ), ); } @@ -168,7 +174,7 @@ public function theProductsShouldHaveAnAdditionalUnitWithConversionRate(ProductI $found = false; foreach ($additionalUnitDefinitions as $unitDefinition) { - if ($unitDefinition->getUnit() === $unit && (float)$conversionRate === $unitDefinition->getConversionRate()) { + if ($unitDefinition->getUnit() === $unit && (float) $conversionRate === $unitDefinition->getConversionRate()) { $found = true; } } @@ -178,8 +184,8 @@ public function theProductsShouldHaveAnAdditionalUnitWithConversionRate(ProductI sprintf( 'Expected the product to have an additional unit %s with conversion-rate %s', $unit->getName(), - $conversionRate - ) + $conversionRate, + ), ); } diff --git a/src/CoreShop/Behat/Context/Domain/ProductPriceRuleContext.php b/src/CoreShop/Behat/Context/Domain/ProductPriceRuleContext.php index e647eb61fd..18bec55abc 100644 --- a/src/CoreShop/Behat/Context/Domain/ProductPriceRuleContext.php +++ b/src/CoreShop/Behat/Context/Domain/ProductPriceRuleContext.php @@ -1,17 +1,20 @@ getTitle('en')) + sprintf('Asserted that the Carrier %s is valid for my cart, but it is not', $carrier->getTitle('en')), ); } } diff --git a/src/CoreShop/Behat/Context/Domain/StoreContext.php b/src/CoreShop/Behat/Context/Domain/StoreContext.php index 7e27af06c6..9d7c936b20 100644 --- a/src/CoreShop/Behat/Context/Domain/StoreContext.php +++ b/src/CoreShop/Behat/Context/Domain/StoreContext.php @@ -1,17 +1,20 @@ getRate(), $rate, - sprintf('given rate "%d" is different from tax-rates rate "%s".', $rate, $taxrate->getRate()) + sprintf('given rate "%d" is different from tax-rates rate "%s".', $rate, $taxrate->getRate()), ); } } diff --git a/src/CoreShop/Behat/Context/Domain/TaxRuleGroupContext.php b/src/CoreShop/Behat/Context/Domain/TaxRuleGroupContext.php index dbd7fb1b8b..199e89dcc5 100644 --- a/src/CoreShop/Behat/Context/Domain/TaxRuleGroupContext.php +++ b/src/CoreShop/Behat/Context/Domain/TaxRuleGroupContext.php @@ -1,17 +1,20 @@ getTaxRules()), $countOfRules) + sprintf('Found %d rules instead of expected %d', count($group->getTaxRules()), $countOfRules), ); } @@ -74,7 +82,7 @@ public function taxRuleShouldTaxThePrice(TaxRuleGroupInterface $taxRuleGroup, $t Assert::eq( $taxAmount, $tax, - sprintf('The tax %s is different to given tax of %s', $taxAmount, $tax) + sprintf('The tax %s is different to given tax of %s', $taxAmount, $tax), ); } diff --git a/src/CoreShop/Behat/Context/Domain/ThemeContext.php b/src/CoreShop/Behat/Context/Domain/ThemeContext.php index bc099e6810..8f07f3a637 100644 --- a/src/CoreShop/Behat/Context/Domain/ThemeContext.php +++ b/src/CoreShop/Behat/Context/Domain/ThemeContext.php @@ -1,17 +1,20 @@ trackProductImpression($this->trackingExtractor->updateMetadata($product)); - $result = str_replace('##id##', (string)$product->getId(), $code->getRaw()); + $result = str_replace('##id##', (string) $product->getId(), $code->getRaw()); Assert::eq(preg_replace("/\r|\n/", '', $this->getRenderedPartForTracker($tracker)), preg_replace("/\r|\n/", '', $result)); } @@ -79,7 +82,7 @@ public function trackProductView(ProductInterface $product, $tracker, PyStringNo $tracker->trackProduct($this->trackingExtractor->updateMetadata($product)); - $result = str_replace('##id##', (string)$product->getId(), $code->getRaw()); + $result = str_replace('##id##', (string) $product->getId(), $code->getRaw()); Assert::eq($this->getRenderedPartForTracker($tracker), $result); } @@ -93,10 +96,10 @@ public function trackCartAdd(OrderInterface $cart, ProductInterface $product, $t $tracker->trackCartAdd($this->trackingExtractor->updateMetadata($cart), $this->trackingExtractor->updateMetadata($product), 1); - $result = str_replace('##id##', (string)$product->getId(), $code->getRaw()); + $result = str_replace('##id##', (string) $product->getId(), $code->getRaw()); if (count($cart->getItems()) > 0) { - $result = str_replace('##item_id##', (string)$cart->getItems()[0]->getId(), $result); + $result = str_replace('##item_id##', (string) $cart->getItems()[0]->getId(), $result); } Assert::eq($this->getRenderedPartForTracker($tracker), $result); @@ -111,7 +114,7 @@ public function trackCartRemove(OrderInterface $cart, ProductInterface $product, $tracker->trackCartRemove($this->trackingExtractor->updateMetadata($cart), $this->trackingExtractor->updateMetadata($product), 1); - $result = str_replace('##id##', (string)$product->getId(), $code->getRaw()); + $result = str_replace('##id##', (string) $product->getId(), $code->getRaw()); Assert::eq($this->getRenderedPartForTracker($tracker), $result); } @@ -125,8 +128,8 @@ public function trackCheckoutStep(OrderInterface $cart, $tracker, PyStringNode $ $tracker->trackCheckoutStep($this->trackingExtractor->updateMetadata($cart)); - $result = str_replace('##id##', (string)$cart->getId(), $code->getRaw()); - $result = str_replace('##item_id##', (string)$cart->getItems()[0]->getId(), $result); + $result = str_replace('##id##', (string) $cart->getId(), $code->getRaw()); + $result = str_replace('##item_id##', (string) $cart->getItems()[0]->getId(), $result); Assert::eq($this->getRenderedPartForTracker($tracker), $result); } @@ -140,8 +143,8 @@ public function trackCheckoutComplete(OrderInterface $order, $tracker, PyStringN $tracker->trackCheckoutComplete($this->trackingExtractor->updateMetadata($order)); - $result = str_replace('##id##', (string)$order->getId(), $code->getRaw()); - $result = str_replace('##item_id##', (string)$order->getItems()[0]->getId(), $result); + $result = str_replace('##id##', (string) $order->getId(), $code->getRaw()); + $result = str_replace('##item_id##', (string) $order->getItems()[0]->getId(), $result); Assert::eq($this->getRenderedPartForTracker($tracker), $code); } @@ -178,12 +181,12 @@ private function getRenderedPartForTracker(TrackerInterface $tracker): string if ($tracker instanceof UniversalEcommerce) { $code = implode( \PHP_EOL, - $blocks[CodeCollector::CONFIG_KEY_GLOBAL][Tracker::BLOCK_AFTER_TRACK]['append'] + $blocks[CodeCollector::CONFIG_KEY_GLOBAL][Tracker::BLOCK_AFTER_TRACK]['append'], ); } else { $code = implode( \PHP_EOL, - $blocks[CodeCollector::CONFIG_KEY_GLOBAL][Tracker::BLOCK_BEFORE_TRACK]['append'] + $blocks[CodeCollector::CONFIG_KEY_GLOBAL][Tracker::BLOCK_BEFORE_TRACK]['append'], ); } diff --git a/src/CoreShop/Behat/Context/Domain/VariantContext.php b/src/CoreShop/Behat/Context/Domain/VariantContext.php index 338b069987..da80611691 100644 --- a/src/CoreShop/Behat/Context/Domain/VariantContext.php +++ b/src/CoreShop/Behat/Context/Domain/VariantContext.php @@ -1,26 +1,27 @@ getChildren([AbstractObject::OBJECT_TYPE_OBJECT])), - $attributeGroup->getRealFullPath() - ) + $attributeGroup->getRealFullPath(), + ), ); } @@ -53,5 +54,4 @@ public function theProductShouldHaveVariants(ProductInterface $product, int $cou { Assert::eq(count($product->getChildren([AbstractObject::OBJECT_TYPE_VARIANT], true)), $count); } - } diff --git a/src/CoreShop/Behat/Context/Hook/CoreShopSetupContext.php b/src/CoreShop/Behat/Context/Hook/CoreShopSetupContext.php index 350af854ea..5a4481061d 100644 --- a/src/CoreShop/Behat/Context/Hook/CoreShopSetupContext.php +++ b/src/CoreShop/Behat/Context/Hook/CoreShopSetupContext.php @@ -1,17 +1,20 @@ setPassword('behat-admin') ->setAdmin(true) ->setCloseWarning(false) - ->save(); + ->save() + ; $this->securityService->logIn($user); diff --git a/src/CoreShop/Behat/Context/Setup/CartContext.php b/src/CoreShop/Behat/Context/Setup/CartContext.php index 34031f1c6b..b33fe05f58 100644 --- a/src/CoreShop/Behat/Context/Setup/CartContext.php +++ b/src/CoreShop/Behat/Context/Setup/CartContext.php @@ -1,17 +1,20 @@ assertActionForm(DiscountPercentConfigurationType::class, 'discountPercent'); $this->addAction($rule, $this->createActionWithForm('discountPercent', [ - 'percent' => (int)$discount, + 'percent' => (int) $discount, ])); } @@ -394,7 +395,7 @@ public function theCartPriceRuleHasADiscountAmountAction(CartPriceRuleInterface $this->assertActionForm(DiscountAmountConfigurationType::class, 'discountAmount'); $this->addAction($rule, $this->createActionWithForm('discountAmount', [ - 'amount' => (int)$amount, + 'amount' => (int) $amount, 'currency' => $currency->getId(), 'applyOn' => $appliedOn, ])); @@ -433,7 +434,7 @@ public function theCartPriceRuleHasASurchargePercentAction(CartPriceRuleInterfac $this->assertActionForm(SurchargePercentConfigurationType::class, 'surchargePercent'); $this->addAction($rule, $this->createActionWithForm('surchargePercent', [ - 'percent' => (int)$surcharge, + 'percent' => (int) $surcharge, ])); } @@ -446,7 +447,7 @@ public function theCartPriceRuleHasASurchargeAmountAction(CartPriceRuleInterface $this->assertActionForm(SurchargeAmountConfigurationType::class, 'surchargeAmount'); $this->addAction($rule, $this->createActionWithForm('surchargeAmount', [ - 'amount' => (int)$amount, + 'amount' => (int) $amount, 'currency' => $currency->getId(), ])); } @@ -557,7 +558,7 @@ public function theCartItemActionHasADiscountPercentAction(ActionInterface $acti $this->assertActionForm(DiscountPercentConfigurationType::class, 'discountPercent'); $this->actionAddAction($action, $this->createActionWithForm('discountPercent', [ - 'percent' => (int)$discount, + 'percent' => (int) $discount, ])); } @@ -570,7 +571,7 @@ public function theCartItemActionHasADiscountAmountAction(ActionInterface $actio $this->assertActionForm(DiscountAmountConfigurationType::class, 'discountAmount'); $this->actionAddAction($action, $this->createActionWithForm('discountAmount', [ - 'amount' => (int)$amount, + 'amount' => (int) $amount, 'currency' => $currency->getId(), 'applyOn' => $appliedOn, ])); @@ -594,7 +595,6 @@ private function actionAddCondition(ActionInterface $action, ConditionInterface return $condition; } - private function actionAddAction(ActionInterface $action, ActionInterface $newAction): ActionInterface { $config = $action->getConfiguration(); diff --git a/src/CoreShop/Behat/Context/Setup/CartPriceRuleVoucherCodeContext.php b/src/CoreShop/Behat/Context/Setup/CartPriceRuleVoucherCodeContext.php index 727630e9c9..68f57b7580 100644 --- a/src/CoreShop/Behat/Context/Setup/CartPriceRuleVoucherCodeContext.php +++ b/src/CoreShop/Behat/Context/Setup/CartPriceRuleVoucherCodeContext.php @@ -1,17 +1,20 @@ kernelRootDirectory), '-d', sprintf('%s/var/config/', $this->kernelRootDirectory), - ] + ], ); $process->run(); } diff --git a/src/CoreShop/Behat/Context/Setup/CurrencyContext.php b/src/CoreShop/Behat/Context/Setup/CurrencyContext.php index 1dce50d621..464d1d6af1 100644 --- a/src/CoreShop/Behat/Context/Setup/CurrencyContext.php +++ b/src/CoreShop/Behat/Context/Setup/CurrencyContext.php @@ -1,17 +1,20 @@ logDirectory, date('YmdHis'), $type); + $path = sprintf('%s/behat-%s.%s', $this->logDirectory, date('YmdHis'), $type); if (file_put_contents($path, $content) === false) { throw new \RuntimeException(sprintf('Failed while trying to write log in "%s".', $path)); } } + private function getStatusCode(Session $session): ?int { try { diff --git a/src/CoreShop/Behat/Context/Setup/ManufacturerContext.php b/src/CoreShop/Behat/Context/Setup/ManufacturerContext.php index 0fa7c87524..7f9f983be9 100644 --- a/src/CoreShop/Behat/Context/Setup/ManufacturerContext.php +++ b/src/CoreShop/Behat/Context/Setup/ManufacturerContext.php @@ -1,17 +1,20 @@ setName($name); $classDefinition->setLayoutDefinitions( - json_decode('') + json_decode(''), ); $classDefinition->save(); @@ -814,7 +819,7 @@ private function setObjectValuesFromTable(Concrete $object, TableNode $table): v private function addFieldDefinitionToDefinition( ClassDefinition|Objectbrick\Definition|Fieldcollection\Definition $definition, - string $fieldDefinition + string $fieldDefinition, ): void { $definitionUpdater = $this->getUpdater($definition); $definitionUpdater->insertField(json_decode(stripslashes($fieldDefinition), true, 512, \JSON_THROW_ON_ERROR)); diff --git a/src/CoreShop/Behat/Context/Setup/ProductContext.php b/src/CoreShop/Behat/Context/Setup/ProductContext.php index 6a7c322325..5fc59b5ab6 100644 --- a/src/CoreShop/Behat/Context/Setup/ProductContext.php +++ b/src/CoreShop/Behat/Context/Setup/ProductContext.php @@ -1,17 +1,20 @@ createVariant($product, $productName, $price, $store); @@ -136,7 +146,7 @@ public function theProductHasAVariantPricedAt( */ public function theProductHasAVariant( ProductInterface $product, - string $productName + string $productName, ): void { $variant = $this->createSimpleVariant($product, $productName); @@ -152,8 +162,7 @@ public function theProductHasVaraintsForAllValuesOfAttributeGroup( ProductInterface $product, AttributeGroupInterface $group1, AttributeGroupInterface $group2, - ): void - { + ): void { $product->setAllowedAttributeGroups([$group1, $group2]); $product->save(); @@ -171,18 +180,18 @@ public function theProductHasVaraintsForAllValuesOfAttributeGroup( '%s %s %s', $product->getName(), $attribute1->getName(), - $attribute2->getName() - ) + $attribute2->getName(), + ), ); $variant->setKey(File::getValidFilename(sprintf( '%s %s %s', $product->getName(), $attribute1->getName(), - $attribute2->getName() + $attribute2->getName(), ))); $variant->setAttributes([ $attribute1, - $attribute2 + $attribute2, ]); $variant->setPublished(true); $this->saveProduct($variant); @@ -198,8 +207,7 @@ public function theProductHasVaraintsForAllValuesOf3AttributeGroups( AttributeGroupInterface $group1, AttributeGroupInterface $group2, AttributeGroupInterface $group3, - ): void - { + ): void { $product->setAllowedAttributeGroups([$group1, $group2, $group3]); $product->save(); @@ -223,7 +231,7 @@ public function theProductHasVaraintsForAllValuesOf3AttributeGroups( $attribute1->getName(), $attribute2->getName(), $attribute3->getName(), - ) + ), ); $variant->setAttributes([ $attribute1, @@ -512,7 +520,7 @@ public function theProductHasAnAdditionalUnit( ProductUnitInterface $unit, $conversionRate, int $price = null, - int $precison = 0 + int $precison = 0, ): void { $definitions = $this->getOrCreateUnitDefinitions($product->getUnitDefinitions()); @@ -521,7 +529,7 @@ public function theProductHasAnAdditionalUnit( */ $defaultUnitDefinition = $this->productUnitDefinition->createNew(); $defaultUnitDefinition->setUnit($unit); - $defaultUnitDefinition->setConversionRate((float)$conversionRate); + $defaultUnitDefinition->setConversionRate((float) $conversionRate); $defaultUnitDefinition->setPrecision($precison); $definitions->addAdditionalUnitDefinition($defaultUnitDefinition); @@ -557,7 +565,7 @@ public function iCopyTheProduct(ProductInterface $product): void { $objectService = new Service(); $newObject = $objectService->copyAsChild($product->getParent(), $product); - + $newObject->setKey($product->getKey() . '-copy'); $newObject->save(); @@ -628,7 +636,7 @@ private function createProduct(string $productName, int $price = 100, StoreInter private function createSimpleVariant( ProductInterface $product, - string $productName + string $productName, ): ProductInterface { $variant = $this->createSimpleProduct($productName); $variant->setParent($product); @@ -644,7 +652,7 @@ private function createVariant( ProductInterface $product, string $productName, int $price = 100, - StoreInterface $store = null + StoreInterface $store = null, ): ProductInterface { $variant = $this->createSimpleVariant($product, $productName); diff --git a/src/CoreShop/Behat/Context/Setup/ProductPriceRuleContext.php b/src/CoreShop/Behat/Context/Setup/ProductPriceRuleContext.php index ccecd59f75..b8e7d8646d 100644 --- a/src/CoreShop/Behat/Context/Setup/ProductPriceRuleContext.php +++ b/src/CoreShop/Behat/Context/Setup/ProductPriceRuleContext.php @@ -1,17 +1,20 @@ assertConditionForm(CountriesConfigurationType::class, 'countries'); @@ -157,7 +165,7 @@ public function theProductPriceRuleHasACountriesCondition( */ public function theProductPriceRuleHasACustomerCondition( ProductPriceRuleInterface $rule, - CustomerInterface $customer + CustomerInterface $customer, ): void { $this->assertConditionForm(CustomersConfigurationType::class, 'customers'); @@ -191,7 +199,7 @@ public function theProductPriceRuleHasATimeSpanCondition(ProductPriceRuleInterfa */ public function theProductPriceRuleHasACustomerGroupCondition( ProductPriceRuleInterface $rule, - CustomerGroupInterface $group + CustomerGroupInterface $group, ): void { $this->assertConditionForm(CustomerGroupsConfigurationType::class, 'customerGroups'); @@ -238,7 +246,7 @@ public function theProductPriceRuleHasAZoneCondition(ProductPriceRuleInterface $ */ public function theProductPriceRuleHasACurrencyCondition( ProductPriceRuleInterface $rule, - CurrencyInterface $currency + CurrencyInterface $currency, ): void { $this->assertConditionForm(CurrenciesConfigurationType::class, 'currencies'); @@ -255,7 +263,7 @@ public function theProductPriceRuleHasACurrencyCondition( */ public function theProductPriceRuleHasACategoriesCondition( ProductPriceRuleInterface $rule, - CategoryInterface $category + CategoryInterface $category, ): void { $this->assertConditionForm(CategoriesConfigurationType::class, 'categories'); @@ -270,7 +278,7 @@ public function theProductPriceRuleHasACategoriesCondition( */ public function theProductPriceRuleHasACategoriesConditionAndItIsRecursive( ProductPriceRuleInterface $rule, - CategoryInterface $category + CategoryInterface $category, ): void { $this->assertConditionForm(CategoriesConfigurationType::class, 'categories'); @@ -288,7 +296,7 @@ public function theProductPriceRuleHasACategoriesConditionAndItIsRecursive( public function theProductPriceRuleHasAProductCondition( ProductPriceRuleInterface $rule, ProductInterface $product, - ProductInterface $product2 = null + ProductInterface $product2 = null, ): void { $this->assertConditionForm(ProductsConfigurationType::class, 'products'); @@ -314,7 +322,7 @@ public function theProductPriceRuleHasAProductCondition( public function theProductPriceRuleHasAProductConditionWhichIncludesVariants( ProductPriceRuleInterface $rule, ProductInterface $product, - ProductInterface $product2 = null + ProductInterface $product2 = null, ): void { $this->assertConditionForm(ProductsConfigurationType::class, 'products'); @@ -341,7 +349,7 @@ public function theProductPriceRuleHasADiscountPercentAction(ProductPriceRuleInt $this->assertActionForm(DiscountPercentConfigurationType::class, 'discountPercent'); $this->addAction($rule, $this->createActionWithForm('discountPercent', [ - 'percent' => (int)$discount, + 'percent' => (int) $discount, ])); } @@ -352,12 +360,12 @@ public function theProductPriceRuleHasADiscountPercentAction(ProductPriceRuleInt public function theProductPriceRuleHasADiscountAmountAction( ProductPriceRuleInterface $rule, $amount, - CurrencyInterface $currency + CurrencyInterface $currency, ): void { $this->assertActionForm(DiscountAmountConfigurationType::class, 'discountAmount'); $this->addAction($rule, $this->createActionWithForm('discountAmount', [ - 'amount' => (int)$amount, + 'amount' => (int) $amount, 'currency' => $currency->getId(), ])); } @@ -369,12 +377,12 @@ public function theProductPriceRuleHasADiscountAmountAction( public function theProductPriceRuleHasADiscountPrice( ProductPriceRuleInterface $rule, $price, - CurrencyInterface $currency + CurrencyInterface $currency, ): void { $this->assertActionForm(PriceConfigurationType::class, 'discountPrice'); $this->addAction($rule, $this->createActionWithForm('discountPrice', [ - 'price' => (int)$price, + 'price' => (int) $price, 'currency' => $currency->getId(), ])); } @@ -388,7 +396,7 @@ public function theProductPriceRuleHasAPrice(ProductPriceRuleInterface $rule, $p $this->assertActionForm(PriceConfigurationType::class, 'price'); $this->addAction($rule, $this->createActionWithForm('price', [ - 'price' => (int)$price, + 'price' => (int) $price, 'currency' => $currency->getId(), ])); } @@ -400,7 +408,7 @@ public function theProductPriceRuleHasAPrice(ProductPriceRuleInterface $rule, $p public function theProductPriceRuleHasAQuantityCondition( ProductPriceRuleInterface $rule, int $min, - int $max + int $max, ): void { $this->assertConditionForm(QuantityConfigurationType::class, 'quantity'); diff --git a/src/CoreShop/Behat/Context/Setup/ProductQuantityPriceRuleContext.php b/src/CoreShop/Behat/Context/Setup/ProductQuantityPriceRuleContext.php index 3de50cc241..ae3e9c96af 100644 --- a/src/CoreShop/Behat/Context/Setup/ProductQuantityPriceRuleContext.php +++ b/src/CoreShop/Behat/Context/Setup/ProductQuantityPriceRuleContext.php @@ -1,17 +1,20 @@ getUnitDefinitionFromProduct($rule->getProduct(), $unit); @@ -244,7 +254,7 @@ public function theProductQuantityPriceRuleHasRangePercentageIncreaseForUnit( ProductQuantityPriceRuleInterface $rule, int $from, $percentage, - ProductUnitInterface $unit + ProductUnitInterface $unit, ): void { $unitDefinition = $this->getUnitDefinitionFromProduct($rule->getProduct(), $unit); @@ -269,7 +279,7 @@ public function theProductQuantityPriceRuleHasRangeAmountDecreaseForUnit( int $from, $amount, CurrencyInterface $currency, - ProductUnitInterface $unit + ProductUnitInterface $unit, ): void { $unitDefinition = $this->getUnitDefinitionFromProduct($rule->getProduct(), $unit); @@ -295,7 +305,7 @@ public function theProductQuantityPriceRuleHasRangeAmountIncreaseForUnit( int $from, $amount, CurrencyInterface $currency, - ProductUnitInterface $unit + ProductUnitInterface $unit, ): void { $unitDefinition = $this->getUnitDefinitionFromProduct($rule->getProduct(), $unit); @@ -321,7 +331,7 @@ public function theProductQuantityPriceRuleHasRangeFixedForUnit( int $from, $amount, CurrencyInterface $currency, - ProductUnitInterface $unit + ProductUnitInterface $unit, ): void { $unitDefinition = $this->getUnitDefinitionFromProduct($rule->getProduct(), $unit); @@ -367,7 +377,7 @@ public function theQuantityPriceRangeIsValidForUnit(QuantityRangeInterface $rang */ public function theProductQuantityPriceRuleHasACountriesCondition( ProductQuantityPriceRuleInterface $rule, - CountryInterface $country + CountryInterface $country, ): void { $this->assertConditionForm(CountriesConfigurationType::class, 'countries'); @@ -384,7 +394,7 @@ public function theProductQuantityPriceRuleHasACountriesCondition( */ public function theProductQuantityPriceRuleHasACustomerCondition( ProductQuantityPriceRuleInterface $rule, - CustomerInterface $customer + CustomerInterface $customer, ): void { $this->assertConditionForm(CustomersConfigurationType::class, 'customers'); @@ -402,7 +412,7 @@ public function theProductQuantityPriceRuleHasACustomerCondition( public function theProductQuantityPriceRuleHasATimeSpanCondition( ProductQuantityPriceRuleInterface $rule, $from, - $to + $to, ): void { $this->assertConditionForm(TimespanConfigurationType::class, 'timespan'); @@ -421,7 +431,7 @@ public function theProductQuantityPriceRuleHasATimeSpanCondition( */ public function theProductQuantityPriceRuleHasACustomerGroupCondition( ProductQuantityPriceRuleInterface $rule, - CustomerGroupInterface $group + CustomerGroupInterface $group, ): void { $this->assertConditionForm(CustomerGroupsConfigurationType::class, 'customerGroups'); @@ -438,7 +448,7 @@ public function theProductQuantityPriceRuleHasACustomerGroupCondition( */ public function theProductQuantityPriceRuleHasAStoreCondition( ProductQuantityPriceRuleInterface $rule, - StoreInterface $store + StoreInterface $store, ): void { $this->assertConditionForm(StoresConfigurationType::class, 'stores'); @@ -455,7 +465,7 @@ public function theProductQuantityPriceRuleHasAStoreCondition( */ public function theProductQuantityPriceRuleHasAZoneCondition( ProductQuantityPriceRuleInterface $rule, - ZoneInterface $zone + ZoneInterface $zone, ): void { $this->assertConditionForm(ZonesConfigurationType::class, 'zones'); @@ -472,7 +482,7 @@ public function theProductQuantityPriceRuleHasAZoneCondition( */ public function theProductsQuantityPriceRuleHasACurrencyCondition( ProductQuantityPriceRuleInterface $rule, - CurrencyInterface $currency + CurrencyInterface $currency, ): void { $this->assertConditionForm(CurrenciesConfigurationType::class, 'currencies'); @@ -491,7 +501,7 @@ public function theProductQuantityPriceRuleHasANestedConditionWithStores( ProductQuantityPriceRuleInterface $rule, $operator, StoreInterface $store1, - StoreInterface $store2 + StoreInterface $store2, ): void { $this->assertConditionForm(ProductSpecificPriceNestedConfigurationType::class, 'nested'); @@ -526,7 +536,7 @@ public function theProductQuantityPriceRuleHasANestedConditionWithStoreAndCountr ProductQuantityPriceRuleInterface $rule, $operator, StoreInterface $store, - CountryInterface $country + CountryInterface $country, ): void { $this->assertConditionForm(ProductSpecificPriceNestedConfigurationType::class, 'nested'); @@ -569,7 +579,7 @@ private function getUnitDefinitionFromProduct(int $productId, ProductUnitInterfa 'Unit %s in product %s (%s) not found', $unit->getName(), $product->getName(), - $product->getId() + $product->getId(), )); } diff --git a/src/CoreShop/Behat/Context/Setup/ProductSpecificPriceRuleContext.php b/src/CoreShop/Behat/Context/Setup/ProductSpecificPriceRuleContext.php index 4d2613fdb1..d14cae7f55 100644 --- a/src/CoreShop/Behat/Context/Setup/ProductSpecificPriceRuleContext.php +++ b/src/CoreShop/Behat/Context/Setup/ProductSpecificPriceRuleContext.php @@ -1,17 +1,20 @@ assertActionForm(DiscountPercentConfigurationType::class, 'discountPercent'); $this->addAction($rule, $this->createActionWithForm('discountPercent', [ - 'percent' => (int)$discount, + 'percent' => (int) $discount, ])); } @@ -226,7 +234,7 @@ public function theProductSpecificPriceRuleHasADiscountAmountAction(ProductSpeci $this->assertActionForm(DiscountAmountConfigurationType::class, 'discountAmount'); $this->addAction($rule, $this->createActionWithForm('discountAmount', [ - 'amount' => (int)$amount, + 'amount' => (int) $amount, 'currency' => $currency->getId(), ])); } @@ -240,7 +248,7 @@ public function theProductSpecificPriceRuleHasADiscountPriceAction(ProductSpecif $this->assertActionForm(PriceConfigurationType::class, 'discountPrice'); $this->addAction($rule, $this->createActionWithForm('discountPrice', [ - 'price' => (int)$price, + 'price' => (int) $price, 'currency' => $currency->getId(), ])); } @@ -254,7 +262,7 @@ public function theProductSpecificPriceRuleHasAPriceAction(ProductSpecificPriceR $this->assertActionForm(PriceConfigurationType::class, 'price'); $this->addAction($rule, $this->createActionWithForm('price', [ - 'price' => (int)$price, + 'price' => (int) $price, 'currency' => $currency->getId(), ])); } diff --git a/src/CoreShop/Behat/Context/Setup/ProductUnitContext.php b/src/CoreShop/Behat/Context/Setup/ProductUnitContext.php index ef98381f3a..2563fd8dee 100644 --- a/src/CoreShop/Behat/Context/Setup/ProductUnitContext.php +++ b/src/CoreShop/Behat/Context/Setup/ProductUnitContext.php @@ -1,17 +1,20 @@ sharedStorage->set( 'data_object_recycle_' . $concrete->getId(), - $item->getId() + $item->getId(), ); } diff --git a/src/CoreShop/Behat/Context/Setup/ShippingContext.php b/src/CoreShop/Behat/Context/Setup/ShippingContext.php index d19593a8c1..52d16bcc88 100644 --- a/src/CoreShop/Behat/Context/Setup/ShippingContext.php +++ b/src/CoreShop/Behat/Context/Setup/ShippingContext.php @@ -1,17 +1,20 @@ assertActionForm(PriceActionConfigurationType::class, 'price'); $this->addAction($rule, $this->createActionWithForm('price', [ - 'price' => (int)$price, + 'price' => (int) $price, 'currency' => $currency->getId(), ])); } @@ -490,7 +500,7 @@ public function theShippingRuleHasAAdditionalAmountAction(ShippingRuleInterface $this->assertActionForm(AdditionAmountActionConfigurationType::class, 'additionAmount'); $this->addAction($rule, $this->createActionWithForm('additionAmount', [ - 'amount' => (int)$amount, + 'amount' => (int) $amount, 'currency' => $currency->getId(), ])); } @@ -504,7 +514,7 @@ public function theShippingRuleHasAAdditionalPercentAction(ShippingRuleInterface $this->assertActionForm(AdditionPercentActionConfigurationType::class, 'additionPercent'); $this->addAction($rule, $this->createActionWithForm('additionPercent', [ - 'percent' => (int)$amount, + 'percent' => (int) $amount, ])); } @@ -517,7 +527,7 @@ public function theShippingRuleHasADiscountAmountAction(ShippingRuleInterface $r $this->assertActionForm(DiscountAmountActionConfigurationType::class, 'discountAmount'); $this->addAction($rule, $this->createActionWithForm('discountAmount', [ - 'amount' => (int)$amount, + 'amount' => (int) $amount, 'currency' => $currency->getId(), ])); } @@ -531,7 +541,7 @@ public function theShippingRuleHasADiscountPercentAction(ShippingRuleInterface $ $this->assertActionForm(DiscountPercentActionConfigurationType::class, 'discountPercent'); $this->addAction($rule, $this->createActionWithForm('discountPercent', [ - 'percent' => (int)$amount, + 'percent' => (int) $amount, ])); } diff --git a/src/CoreShop/Behat/Context/Setup/StoreContext.php b/src/CoreShop/Behat/Context/Setup/StoreContext.php index 48e1ed669e..ebff9d5f30 100644 --- a/src/CoreShop/Behat/Context/Setup/StoreContext.php +++ b/src/CoreShop/Behat/Context/Setup/StoreContext.php @@ -1,17 +1,20 @@ getAllowedAttributeGroups() ?? []; @@ -126,7 +128,7 @@ public function theProductIsAllowedAttributeGroup( */ public function theVariantUsesAttributeColor( ProductVariantAwareInterface $product, - AttributeColorInterface $attributeColor + AttributeColorInterface $attributeColor, ): void { $attributes = $product->getAttributes() ?? []; @@ -142,7 +144,7 @@ public function theVariantUsesAttributeColor( */ public function theVariantUsesAttributeValue( ProductVariantAwareInterface $product, - AttributeValueInterface $attributeValue + AttributeValueInterface $attributeValue, ): void { $attributes = $product->getAttributes() ?? []; @@ -152,7 +154,6 @@ public function theVariantUsesAttributeValue( $product->save(); } - /** * @Given /^the (variant "[^"]+") uses (attribute color "[^"]+") and (attribute value "[^"]+")$/ * @Given /^the (variant) uses (attribute color "[^"]+") and (attribute value "[^"]+")$/ @@ -180,9 +181,9 @@ private function hex2rgba(string $color): RgbaColor // Check if color has 6 or 3 characters and get values if (strlen($color) === 6) { - $hex = array($color[0].$color[1], $color[2].$color[3], $color[4].$color[5]); + $hex = [$color[0] . $color[1], $color[2] . $color[3], $color[4] . $color[5]]; } elseif (strlen($color) === 3) { - $hex = array($color[0].$color[0], $color[1].$color[1], $color[2].$color[2]); + $hex = [$color[0] . $color[0], $color[1] . $color[1], $color[2] . $color[2]]; } else { return new RgbaColor(0, 0, 0, 0); } diff --git a/src/CoreShop/Behat/Context/Setup/VersionContext.php b/src/CoreShop/Behat/Context/Setup/VersionContext.php index 2242fcf5dc..57897ddb35 100644 --- a/src/CoreShop/Behat/Context/Setup/VersionContext.php +++ b/src/CoreShop/Behat/Context/Setup/VersionContext.php @@ -1,17 +1,20 @@ getObjects()), 1, - sprintf('%d categories has been found with name "%s".', count($list->getObjects()), $categoryName) + sprintf('%d categories has been found with name "%s".', count($list->getObjects()), $categoryName), ); $objects = $list->getObjects(); diff --git a/src/CoreShop/Behat/Context/Transform/CountryContext.php b/src/CoreShop/Behat/Context/Transform/CountryContext.php index 8128a3182c..3a0456007c 100644 --- a/src/CoreShop/Behat/Context/Transform/CountryContext.php +++ b/src/CoreShop/Behat/Context/Transform/CountryContext.php @@ -1,17 +1,20 @@ getObjects()), 1, - sprintf('%d products has been found with name "%s".', count($list->getObjects()), $productName) + sprintf('%d products has been found with name "%s".', count($list->getObjects()), $productName), ); $objects = $list->getObjects(); @@ -73,7 +78,7 @@ public function getProductByKey($productName) Assert::eq( count($list->getObjects()), 1, - sprintf('%d products has been found with key "%s".', count($list->getObjects()), $productName) + sprintf('%d products has been found with key "%s".', count($list->getObjects()), $productName), ); $objects = $list->getObjects(); diff --git a/src/CoreShop/Behat/Context/Transform/ProductPriceRuleContext.php b/src/CoreShop/Behat/Context/Transform/ProductPriceRuleContext.php index 444d6ed667..0d32a9acdc 100644 --- a/src/CoreShop/Behat/Context/Transform/ProductPriceRuleContext.php +++ b/src/CoreShop/Behat/Context/Transform/ProductPriceRuleContext.php @@ -1,17 +1,20 @@ getStatusCode(), - $requests[$index]->getUri() - ) + $requests[$index]->getUri(), + ), ); } @@ -93,8 +99,8 @@ public function iOpenCartSummaryPage(PaymentInterface $payment): void 4, sprintf( 'Expected to have 4 state changes, but got %s instead. Maybe concurrent state changes?', - count($checkStates) - ) + count($checkStates), + ), ); } } diff --git a/src/CoreShop/Behat/Context/Ui/Frontend/CartContext.php b/src/CoreShop/Behat/Context/Ui/Frontend/CartContext.php index 6fef1ab0f2..514e7e799c 100644 --- a/src/CoreShop/Behat/Context/Ui/Frontend/CartContext.php +++ b/src/CoreShop/Behat/Context/Ui/Frontend/CartContext.php @@ -1,17 +1,20 @@ notificationChecker->checkNotification( sprintf('YOU NEED TO ORDER AT LEAST %s UNITS OF %s.', $quantity, $productName), - NotificationType::error() + NotificationType::error(), ); } @@ -183,7 +191,7 @@ public function iShouldBeNotifiedThatICanOnlyOrderAMaximumQuantityOf(string $qua { $this->notificationChecker->checkNotification( sprintf('YOU CAN ORDER A MAXIMUM OF %s UNITS OF %s.', $quantity, $productName), - NotificationType::error() + NotificationType::error(), ); } @@ -194,7 +202,7 @@ public function iShouldBeNotifiedThatDoesNotHaveSufficientStock(string $productN { $this->notificationChecker->checkNotification( sprintf('%s DOES NOT HAVE SUFFICIENT STOCK.', $productName), - NotificationType::error() + NotificationType::error(), ); } @@ -274,7 +282,7 @@ public function iShouldSeeProductWithUnitInMyCart(ProductInterface $product, Pro */ public function iShouldSeeWithQuantityInMyCart($productName, $quantity): void { - Assert::same($this->cartPage->getQuantity($productName), (int)$quantity); + Assert::same($this->cartPage->getQuantity($productName), (int) $quantity); } /** diff --git a/src/CoreShop/Behat/Context/Ui/Frontend/CheckoutContext.php b/src/CoreShop/Behat/Context/Ui/Frontend/CheckoutContext.php index aee3a78525..8728a27c20 100644 --- a/src/CoreShop/Behat/Context/Ui/Frontend/CheckoutContext.php +++ b/src/CoreShop/Behat/Context/Ui/Frontend/CheckoutContext.php @@ -1,17 +1,20 @@ changePasswordPage->checkValidationMessageFor( 'new_password', - 'The password fields must match.' + 'The password fields must match.', )); } @@ -105,7 +113,7 @@ public function iShouldBeNotifiedThatProvidedPasswordIsDifferentThanTheCurrentOn { Assert::true($this->changePasswordPage->checkValidationMessageFor( 'current_password', - 'This value should be the user\'s current password.' + 'This value should be the user\'s current password.', )); } @@ -193,7 +201,7 @@ public function iShouldBeNotifiedThatElementIsRequired(string $element): void { Assert::true($this->changeProfilePage->checkValidationMessageFor( $element, - 'This value should not be blank.' + 'This value should not be blank.', )); } @@ -204,7 +212,7 @@ public function iShouldBeNotifiedThatElementIsInvalid(string $element): void { Assert::true($this->changeProfilePage->checkValidationMessageFor( $element, - 'This value is not a valid email address.' + 'This value is not a valid email address.', )); } @@ -215,7 +223,7 @@ public function iShouldBeNotifiedThatThePasswordDoNotMatch(string $element): voi { Assert::true($this->changeProfilePage->checkValidationMessageFor( $element, - sprintf('The %s fields must match.', $element) + sprintf('The %s fields must match.', $element), )); } @@ -226,7 +234,7 @@ public function iShouldBeNotifiedThatTheEmailIsAlreadyUsed(): void { Assert::true($this->changeProfilePage->checkValidationMessageFor( 'email', - 'This email is already used.' + 'This email is already used.', )); } } diff --git a/src/CoreShop/Behat/Context/Ui/Frontend/HomepageContext.php b/src/CoreShop/Behat/Context/Ui/Frontend/HomepageContext.php index 71f931eba0..b3bf31e601 100644 --- a/src/CoreShop/Behat/Context/Ui/Frontend/HomepageContext.php +++ b/src/CoreShop/Behat/Context/Ui/Frontend/HomepageContext.php @@ -1,17 +1,20 @@ getSession(), null, $selector, - $locator + $locator, ); } diff --git a/src/CoreShop/Behat/Element/Frontend/Account/RegisterElement.php b/src/CoreShop/Behat/Element/Frontend/Account/RegisterElement.php index 5da079b44f..d08814927a 100644 --- a/src/CoreShop/Behat/Element/Frontend/Account/RegisterElement.php +++ b/src/CoreShop/Behat/Element/Frontend/Account/RegisterElement.php @@ -1,17 +1,20 @@ $unitDefinition->getId(), '%name%' => $name, - ] + ], ); } @@ -82,7 +85,7 @@ public function getItemTotalPriceWithUnit(string $name, ProductUnitDefinitionInt public function getQuantity(string $productName): int { - return (int)$this->getElement('item_quantity_input', ['%name%' => $productName])->getValue(); + return (int) $this->getElement('item_quantity_input', ['%name%' => $productName])->getValue(); } public function changeQuantity(string $productName, string $quantity): void diff --git a/src/CoreShop/Behat/Page/Frontend/CartPageInterface.php b/src/CoreShop/Behat/Page/Frontend/CartPageInterface.php index 219284ba24..e74bef186e 100644 --- a/src/CoreShop/Behat/Page/Frontend/CartPageInterface.php +++ b/src/CoreShop/Behat/Page/Frontend/CartPageInterface.php @@ -1,17 +1,20 @@ getText(); }, - $this->getElement('latest_products')->findAll('css', '[data-test-product-name]') + $this->getElement('latest_products')->findAll('css', '[data-test-product-name]'), ); } diff --git a/src/CoreShop/Behat/Page/Frontend/HomePageInterface.php b/src/CoreShop/Behat/Page/Frontend/HomePageInterface.php index 3d7de1ab50..89d6758596 100644 --- a/src/CoreShop/Behat/Page/Frontend/HomePageInterface.php +++ b/src/CoreShop/Behat/Page/Frontend/HomePageInterface.php @@ -1,17 +1,20 @@ processQuantityPriceRuleElement( sprintf( '[data-test-product-quantity-price-rule-unit-%s]', - $unit->getId() - ) + $unit->getId(), + ), ); } @@ -119,14 +122,14 @@ public function isAttributeSelected(AttributeInterface $attribute): bool public function isAttributeDisabled(AttributeInterface $attribute): bool { - return $this->getElement('attribute', ['%id%' => $attribute->getId()])->getAttribute('disabled') === "true"; + return $this->getElement('attribute', ['%id%' => $attribute->getId()])->getAttribute('disabled') === 'true'; } public function isAttributeEnabled(AttributeInterface $attribute): bool { $attr = $this->getElement('attribute', ['%id%' => $attribute->getId()])->getAttribute('disabled'); - return "false" === $attr || null === $attr; + return 'false' === $attr || null === $attr; } protected function processQuantityPriceRuleElement(string $selector): array @@ -146,7 +149,7 @@ static function (NodeElement $element) { 'priceExcl' => $priceExcElement->getText(), ]; }, - $element->findAll('css', $selector) + $element->findAll('css', $selector), ); } diff --git a/src/CoreShop/Behat/Page/Frontend/ProductPageInterface.php b/src/CoreShop/Behat/Page/Frontend/ProductPageInterface.php index 6790c1c555..e2360c63b4 100644 --- a/src/CoreShop/Behat/Page/Frontend/ProductPageInterface.php +++ b/src/CoreShop/Behat/Page/Frontend/ProductPageInterface.php @@ -1,17 +1,20 @@ getSession(), null, $selector, - $locator + $locator, ); } @@ -67,8 +70,8 @@ public function waitForPimcore($time = 10000, $condition = null): void sprintf( 'Timeout of %d reached when checking on "%s"', $time, - $condition_item - ) + $condition_item, + ), ); } } diff --git a/src/CoreShop/Behat/Page/Pimcore/AbstractPimcoreTabPage.php b/src/CoreShop/Behat/Page/Pimcore/AbstractPimcoreTabPage.php index a060c3e846..b7c50b565a 100644 --- a/src/CoreShop/Behat/Page/Pimcore/AbstractPimcoreTabPage.php +++ b/src/CoreShop/Behat/Page/Pimcore/AbstractPimcoreTabPage.php @@ -1,17 +1,20 @@ getId(), 'test', ['custom_col' => 'blub']), diff --git a/src/CoreShop/Behat/Service/Exception/NotificationExpectationMismatchException.php b/src/CoreShop/Behat/Service/Exception/NotificationExpectationMismatchException.php index aef01c20eb..c650eb84ca 100644 --- a/src/CoreShop/Behat/Service/Exception/NotificationExpectationMismatchException.php +++ b/src/CoreShop/Behat/Service/Exception/NotificationExpectationMismatchException.php @@ -1,17 +1,20 @@ getClientEmail(); $details['client_id'] = $payment->getClientId(); - $request->setResult((array)$details); + $request->setResult((array) $details); } public function supports($request): bool diff --git a/src/CoreShop/Behat/Service/Payum/Concurrency/Action/NotifyAction.php b/src/CoreShop/Behat/Service/Payum/Concurrency/Action/NotifyAction.php index 7b3f0d77c8..574b5ac2fd 100644 --- a/src/CoreShop/Behat/Service/Payum/Concurrency/Action/NotifyAction.php +++ b/src/CoreShop/Behat/Service/Payum/Concurrency/Action/NotifyAction.php @@ -1,17 +1,20 @@ sessionTokenVariable = sprintf('_security_%s', $firewallContextName); } diff --git a/src/CoreShop/Behat/Service/SecurityServiceInterface.php b/src/CoreShop/Behat/Service/SecurityServiceInterface.php index 13ab250ea7..1f6590b60b 100644 --- a/src/CoreShop/Behat/Service/SecurityServiceInterface.php +++ b/src/CoreShop/Behat/Service/SecurityServiceInterface.php @@ -1,17 +1,20 @@ cookieSetter->setCookie('_store_id', (string)$store->getId()); + $this->cookieSetter->setCookie('_store_id', (string) $store->getId()); } } diff --git a/src/CoreShop/Behat/Service/StoreContextSetterInterface.php b/src/CoreShop/Behat/Service/StoreContextSetterInterface.php index b9cb256a4a..5c0577c19b 100644 --- a/src/CoreShop/Behat/Service/StoreContextSetterInterface.php +++ b/src/CoreShop/Behat/Service/StoreContextSetterInterface.php @@ -1,17 +1,20 @@ data = [ 'country' => null, diff --git a/src/CoreShop/Bundle/AddressBundle/Controller/CountryController.php b/src/CoreShop/Bundle/AddressBundle/Controller/CountryController.php index 98c0c67405..38fd275a5d 100644 --- a/src/CoreShop/Bundle/AddressBundle/Controller/CountryController.php +++ b/src/CoreShop/Bundle/AddressBundle/Controller/CountryController.php @@ -1,17 +1,20 @@ scalarNode('address')->defaultValue(AddressInterface::class)->cannotBeEmpty()->end() ->end() ->end() - ->end(); + ->end() + ; } private function addModelsSection(ArrayNodeDefinition $node): void @@ -208,7 +212,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -239,6 +244,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/AddressBundle/DependencyInjection/CoreShopAddressExtension.php b/src/CoreShop/Bundle/AddressBundle/DependencyInjection/CoreShopAddressExtension.php index d95bcaf485..a31b29ba71 100644 --- a/src/CoreShop/Bundle/AddressBundle/DependencyInjection/CoreShopAddressExtension.php +++ b/src/CoreShop/Bundle/AddressBundle/DependencyInjection/CoreShopAddressExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(CountryContextInterface::class) - ->addTag(CompositeCountryContextPass::COUNTRY_CONTEXT_SERVICE_TAG); + ->addTag(CompositeCountryContextPass::COUNTRY_CONTEXT_SERVICE_TAG) + ; $container ->registerForAutoconfiguration(RequestResolverInterface::class) - ->addTag(CompositeRequestResolverPass::COUNTRY_REQUEST_RESOLVER_SERVICE_TAG); + ->addTag(CompositeRequestResolverPass::COUNTRY_REQUEST_RESOLVER_SERVICE_TAG) + ; } } diff --git a/src/CoreShop/Bundle/AddressBundle/Doctrine/ORM/AddressIdentifierRepository.php b/src/CoreShop/Bundle/AddressBundle/Doctrine/ORM/AddressIdentifierRepository.php index 7d67b10841..c5d40cd044 100644 --- a/src/CoreShop/Bundle/AddressBundle/Doctrine/ORM/AddressIdentifierRepository.php +++ b/src/CoreShop/Bundle/AddressBundle/Doctrine/ORM/AddressIdentifierRepository.php @@ -1,17 +1,20 @@ andWhere('o.name = :name') ->setParameter('name', $name) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/AddressBundle/Doctrine/ORM/CountryRepository.php b/src/CoreShop/Bundle/AddressBundle/Doctrine/ORM/CountryRepository.php index 82ac7c846c..283104f422 100644 --- a/src/CoreShop/Bundle/AddressBundle/Doctrine/ORM/CountryRepository.php +++ b/src/CoreShop/Bundle/AddressBundle/Doctrine/ORM/CountryRepository.php @@ -1,17 +1,20 @@ setParameter('name', $name) ->setParameter('locale', $locale) ->getQuery() - ->getResult(); + ->getResult() + ; } public function findByCode(string $code): ?CountryInterface @@ -44,6 +48,7 @@ public function findByCode(string $code): ?CountryInterface ->andWhere('o.isoCode= :isoCode') ->setParameter('isoCode', $code) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressIdentifierChoiceType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressIdentifierChoiceType.php index 241847e9d2..180662658c 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressIdentifierChoiceType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressIdentifierChoiceType.php @@ -1,17 +1,20 @@ 'name', 'choice_translation_domain' => false, 'active' => true, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressIdentifierType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressIdentifierType.php index 502b43639a..5d80b58a42 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressIdentifierType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressIdentifierType.php @@ -1,17 +1,20 @@ add('name', TextType::class) - ->add('active', CheckboxType::class); + ->add('active', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressType.php index 3f1f3e5c98..625a852065 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/AddressType.php @@ -1,17 +1,20 @@ add('_redirect', HiddenType::class, [ 'mapped' => false, - ]); + ]) + ; if ($options['show_address_identifier_choice'] === true) { $builder->add('addressIdentifier', AddressIdentifierChoiceType::class, [ diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryChoiceType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryChoiceType.php index 0c3675e82b..3c2506891d 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryChoiceType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryChoiceType.php @@ -1,17 +1,20 @@ 'name', 'choice_translation_domain' => false, 'active' => true, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryTranslationType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryTranslationType.php index 36bc1e0e23..f7fbebe7cf 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryTranslationType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryTranslationType.php @@ -1,17 +1,20 @@ add('name', TextType::class); + ->add('name', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryType.php index 8327beb336..ae7d7aa91e 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/CountryType.php @@ -1,17 +1,20 @@ TextType::class, 'allow_delete' => true, 'allow_add' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/SalutationChoiceType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/SalutationChoiceType.php index b89f547a06..aed402c663 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/SalutationChoiceType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/SalutationChoiceType.php @@ -1,17 +1,20 @@ 'name', 'choice_translation_domain' => false, 'active' => true, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/StateTranslationType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/StateTranslationType.php index 2e5692f477..993e728a82 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/StateTranslationType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/StateTranslationType.php @@ -1,17 +1,20 @@ add('name', TextType::class); + ->add('name', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/StateType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/StateType.php index c07355ec1c..6d1715b40d 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/StateType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/StateType.php @@ -1,17 +1,20 @@ add('active', CheckboxType::class) ->add('country', CountryChoiceType::class, [ 'active' => null, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneChoiceType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneChoiceType.php index 34808ee5a3..5892df3cfa 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneChoiceType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneChoiceType.php @@ -1,17 +1,20 @@ 'name', 'choice_translation_domain' => false, 'active' => true, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneType.php b/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneType.php index 9716c82513..bcc4af77e9 100644 --- a/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneType.php +++ b/src/CoreShop/Bundle/AddressBundle/Form/Type/ZoneType.php @@ -1,17 +1,20 @@ add('name', TextType::class) - ->add('active', CheckboxType::class); + ->add('active', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/css/address.css b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/css/address.css index cfce11a80b..5397321daf 100644 --- a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/css/address.css +++ b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/css/address.css @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ .coreshop_icon_country, .pimcore_icon_coreShopCountryMultiselect, .pimcore_icon_coreShopCountry{ diff --git a/src/CoreShop/Bundle/AddressBundle/Twig/FormatAddressExtension.php b/src/CoreShop/Bundle/AddressBundle/Twig/FormatAddressExtension.php index 7678d9c492..ddbaf0b813 100644 --- a/src/CoreShop/Bundle/AddressBundle/Twig/FormatAddressExtension.php +++ b/src/CoreShop/Bundle/AddressBundle/Twig/FormatAddressExtension.php @@ -1,17 +1,20 @@ context->buildViolation($constraint->message) ->setParameter('%address_identifier%', $value) - ->addViolation(); + ->addViolation() + ; } } } diff --git a/src/CoreShop/Bundle/ConfigurationBundle/Controller/ConfigurationController.php b/src/CoreShop/Bundle/ConfigurationBundle/Controller/ConfigurationController.php index d0b5d3def5..057087e868 100644 --- a/src/CoreShop/Bundle/ConfigurationBundle/Controller/ConfigurationController.php +++ b/src/CoreShop/Bundle/ConfigurationBundle/Controller/ConfigurationController.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/ConfigurationBundle/DependencyInjection/CoreShopConfigurationExtension.php b/src/CoreShop/Bundle/ConfigurationBundle/DependencyInjection/CoreShopConfigurationExtension.php index c2bfcde555..1a89df66f9 100644 --- a/src/CoreShop/Bundle/ConfigurationBundle/DependencyInjection/CoreShopConfigurationExtension.php +++ b/src/CoreShop/Bundle/ConfigurationBundle/DependencyInjection/CoreShopConfigurationExtension.php @@ -1,17 +1,20 @@ andWhere('o.key = :key') ->setParameter('key', $key) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/ConfigurationBundle/Form/Type/ConfigurationCollectionType.php b/src/CoreShop/Bundle/ConfigurationBundle/Form/Type/ConfigurationCollectionType.php index 5d1117f0df..6dd254f218 100644 --- a/src/CoreShop/Bundle/ConfigurationBundle/Form/Type/ConfigurationCollectionType.php +++ b/src/CoreShop/Bundle/ConfigurationBundle/Form/Type/ConfigurationCollectionType.php @@ -1,17 +1,20 @@ ConfigurationType::class, 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ConfigurationBundle/Form/Type/ConfigurationType.php b/src/CoreShop/Bundle/ConfigurationBundle/Form/Type/ConfigurationType.php index fd8d4dfa4d..051fb7624d 100644 --- a/src/CoreShop/Bundle/ConfigurationBundle/Form/Type/ConfigurationType.php +++ b/src/CoreShop/Bundle/ConfigurationBundle/Form/Type/ConfigurationType.php @@ -1,17 +1,20 @@ add('key', TextType::class) - ->add('data', TextType::class); + ->add('data', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ConfigurationBundle/Serialization/ObjectHandler.php b/src/CoreShop/Bundle/ConfigurationBundle/Serialization/ObjectHandler.php index 0450d44484..c6b14be1aa 100644 --- a/src/CoreShop/Bundle/ConfigurationBundle/Serialization/ObjectHandler.php +++ b/src/CoreShop/Bundle/ConfigurationBundle/Serialization/ObjectHandler.php @@ -1,17 +1,20 @@ hasItems() - && ($cart->hasShippableItems() === false || $cart->getShippingAddress() instanceof AddressInterface) - && $cart->getInvoiceAddress() instanceof AddressInterface; + return $cart->hasItems() && + ($cart->hasShippableItems() === false || $cart->getShippingAddress() instanceof AddressInterface) && + $cart->getInvoiceAddress() instanceof AddressInterface; } public function commitStep(OrderInterface $cart, Request $request): bool @@ -62,7 +65,7 @@ public function commitStep(OrderInterface $cart, Request $request): bool return $isGuest ? $this->guestAddressCheckoutStep->commitStep( $cart, - $request + $request, ) : $this->customerAddressCheckoutStep->commitStep($cart, $request); } @@ -82,7 +85,7 @@ public function prepareStep(OrderInterface $cart, Request $request): array $isGuest ? $this->guestAddressCheckoutStep->prepareStep($cart, $request) : $this->customerAddressCheckoutStep->prepareStep($cart, $request), - ['is_guest' => $isGuest] + ['is_guest' => $isGuest], ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Checkout/Step/CustomerAddressCheckoutStep.php b/src/CoreShop/Bundle/CoreBundle/Checkout/Step/CustomerAddressCheckoutStep.php index 6a445df97c..7c0c9881b2 100644 --- a/src/CoreShop/Bundle/CoreBundle/Checkout/Step/CustomerAddressCheckoutStep.php +++ b/src/CoreShop/Bundle/CoreBundle/Checkout/Step/CustomerAddressCheckoutStep.php @@ -1,17 +1,20 @@ hasItems() - && ($cart->hasShippableItems() === false || $cart->getShippingAddress() instanceof AddressInterface) - && $cart->getInvoiceAddress() instanceof AddressInterface; + return $cart->hasItems() && + ($cart->hasShippableItems() === false || $cart->getShippingAddress() instanceof AddressInterface) && + $cart->getInvoiceAddress() instanceof AddressInterface; } public function commitStep(OrderInterface $cart, Request $request): bool diff --git a/src/CoreShop/Bundle/CoreBundle/Checkout/Step/CustomerCheckoutStep.php b/src/CoreShop/Bundle/CoreBundle/Checkout/Step/CustomerCheckoutStep.php index 372d803ebf..0d0bd623f6 100644 --- a/src/CoreShop/Bundle/CoreBundle/Checkout/Step/CustomerCheckoutStep.php +++ b/src/CoreShop/Bundle/CoreBundle/Checkout/Step/CustomerCheckoutStep.php @@ -1,17 +1,20 @@ getData(); if ($form->get('useInvoiceAsShipping')->getData()) { - $cart->getInvoiceAddress()->setParent(Service::createFolderByPath($cart.'/addresses')); + $cart->getInvoiceAddress()->setParent(Service::createFolderByPath($cart . '/addresses')); $cart->getInvoiceAddress()->setKey(uniqid()); $cart->getInvoiceAddress()->setPublished(true); $cart->getInvoiceAddress()->save(); @@ -75,7 +80,7 @@ public function commitStep(OrderInterface $cart, Request $request): bool $cart->setShippingAddress($cart->getInvoiceAddress()); } else { foreach ([$cart->getInvoiceAddress(), $cart->getShippingAddress()] as $address) { - $address->setParent(Service::createFolderByPath($cart.'/addresses')); + $address->setParent(Service::createFolderByPath($cart . '/addresses')); $address->setKey(uniqid()); $address->setPublished(true); $address->save(); diff --git a/src/CoreShop/Bundle/CoreBundle/Checkout/Step/PaymentCheckoutStep.php b/src/CoreShop/Bundle/CoreBundle/Checkout/Step/PaymentCheckoutStep.php index 03a0d0728c..8e64b599f9 100644 --- a/src/CoreShop/Bundle/CoreBundle/Checkout/Step/PaymentCheckoutStep.php +++ b/src/CoreShop/Bundle/CoreBundle/Checkout/Step/PaymentCheckoutStep.php @@ -1,17 +1,20 @@ hasShippableItems() === false - || ($cart->hasItems() && + return $cart->hasShippableItems() === false || + ($cart->hasItems() && $cart->getCarrier() instanceof CarrierInterface && $cart->getShippingAddress() instanceof AddressInterface && $this->shippableCarrierValidator->isCarrierValid($cart->getCarrier(), $cart, $cart->getShippingAddress())); diff --git a/src/CoreShop/Bundle/CoreBundle/Checkout/Step/SummaryCheckoutStep.php b/src/CoreShop/Bundle/CoreBundle/Checkout/Step/SummaryCheckoutStep.php index 47d85142ed..458c0a6e45 100644 --- a/src/CoreShop/Bundle/CoreBundle/Checkout/Step/SummaryCheckoutStep.php +++ b/src/CoreShop/Bundle/CoreBundle/Checkout/Step/SummaryCheckoutStep.php @@ -1,17 +1,20 @@ data = [ diff --git a/src/CoreShop/Bundle/CoreBundle/Command/AbstractInstallCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/AbstractInstallCommand.php index eb07d650e6..2d2d50d4f6 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/AbstractInstallCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/AbstractInstallCommand.php @@ -1,17 +1,20 @@ setHeaders($headers) ->setRows($rows) - ->render(); + ->render() + ; } protected function createProgressBar(OutputInterface $output, int $length = 10): ProgressBar diff --git a/src/CoreShop/Bundle/CoreBundle/Command/InstallCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/InstallCommand.php index 0cf8688a45..7e4d4a14ae 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/InstallCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/InstallCommand.php @@ -1,17 +1,20 @@ %command.name% command installs CoreShop. EOT - ); + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int @@ -83,10 +85,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int 'Step %d of %d. %s', $step + 1, count($this->commands), - $command['message'] - ) + $command['message'], + ), ); - $this->commandExecutor->runCommand('coreshop:install:'.$command['command'], [], $output); + $this->commandExecutor->runCommand('coreshop:install:' . $command['command'], [], $output); } catch (RuntimeException) { $errored = true; } @@ -98,8 +100,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int $outputStyle->success($this->getProperFinalMessage($errored)); $outputStyle->writeln( sprintf( - 'You can now open your store at the following path under the website root: /' - ) + 'You can now open your store at the following path under the website root: /', + ), ); return 0; diff --git a/src/CoreShop/Bundle/CoreBundle/Command/InstallDatabaseCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/InstallDatabaseCommand.php index 08bc4fd013..aa7d27d868 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/InstallDatabaseCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/InstallDatabaseCommand.php @@ -1,17 +1,20 @@ %command.name% command creates CoreShop database. EOT - ); + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int @@ -48,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $outputStyle = new SymfonyStyle($input, $output); $outputStyle->writeln(sprintf( 'Creating CoreShop database for environment %s.', - $this->getEnvironment() + $this->getEnvironment(), )); $commands = $this->databaseSetupCommand->getCommands($input, $output, $this->getHelper('question')); diff --git a/src/CoreShop/Bundle/CoreBundle/Command/InstallDemoCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/InstallDemoCommand.php index 8ece88f9a8..b3d117a82f 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/InstallDemoCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/InstallDemoCommand.php @@ -1,17 +1,20 @@ %command.name% command install CoreShop Demo Data. EOT - ); + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/CoreBundle/Command/InstallFixturesCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/InstallFixturesCommand.php index d86c88aca4..0d78f33417 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/InstallFixturesCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/InstallFixturesCommand.php @@ -1,17 +1,20 @@ %command.name% command install CoreShop Main Fixtures. EOT - ); + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/CoreBundle/Command/InstallFoldersCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/InstallFoldersCommand.php index b7a2fab38f..7468d475bf 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/InstallFoldersCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/InstallFoldersCommand.php @@ -1,17 +1,20 @@ %command.name% command creates CoreShop Object Folders. EOT - ); + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int @@ -48,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $outputStyle = new SymfonyStyle($input, $output); $outputStyle->writeln(sprintf( 'Creating CoreShop Folders %s.', - $this->getEnvironment() + $this->getEnvironment(), )); $this->folderInstaller->installFolders(); diff --git a/src/CoreShop/Bundle/CoreBundle/Command/InstallResourcesCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/InstallResourcesCommand.php index 97682938fe..a06c8bb92f 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/InstallResourcesCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/InstallResourcesCommand.php @@ -1,17 +1,20 @@ %command.name% command creates CoreShop Resources. EOT - ); + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/CoreBundle/Command/MigrateCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/MigrateCommand.php index e8b4bc37cc..213765e264 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/MigrateCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/MigrateCommand.php @@ -1,17 +1,20 @@ %command.name% executes all CoreShop migrations. EOT - ); + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/CoreBundle/Command/MigrationGenerateCommand.php b/src/CoreShop/Bundle/CoreBundle/Command/MigrationGenerateCommand.php index e526fe15db..823cfaca33 100644 --- a/src/CoreShop/Bundle/CoreBundle/Command/MigrationGenerateCommand.php +++ b/src/CoreShop/Bundle/CoreBundle/Command/MigrationGenerateCommand.php @@ -1,17 +1,20 @@ getCompanyRepository()->getList(); - $list->addConditionParam(sprintf('name LIKE "%%%s%%"', (string)$value)); + $list->addConditionParam(sprintf('name LIKE "%%%s%%"', (string) $value)); $foundObjects = $list->getData(); } diff --git a/src/CoreShop/Bundle/CoreBundle/Controller/OrderController.php b/src/CoreShop/Bundle/CoreBundle/Controller/OrderController.php index d4b327da83..00d30ebb3b 100644 --- a/src/CoreShop/Bundle/CoreBundle/Controller/OrderController.php +++ b/src/CoreShop/Bundle/CoreBundle/Controller/OrderController.php @@ -1,17 +1,20 @@ getShippingAddress(), true, - $this->get(CartContextResolverInterface::class)->resolveCartContext($cart) + $this->get(CartContextResolverInterface::class)->resolveCartContext($cart), ); $result[] = [ diff --git a/src/CoreShop/Bundle/CoreBundle/Controller/PortletsController.php b/src/CoreShop/Bundle/CoreBundle/Controller/PortletsController.php index 91c195679f..ddc89f9af7 100644 --- a/src/CoreShop/Bundle/CoreBundle/Controller/PortletsController.php +++ b/src/CoreShop/Bundle/CoreBundle/Controller/PortletsController.php @@ -1,17 +1,20 @@ headers->makeDisposition( ResponseHeaderBag::DISPOSITION_ATTACHMENT, - sprintf('%s.csv', $portletName) + sprintf('%s.csv', $portletName), ); $response->headers->set('Content-Disposition', $disposition); diff --git a/src/CoreShop/Bundle/CoreBundle/Controller/ProductController.php b/src/CoreShop/Bundle/CoreBundle/Controller/ProductController.php index ae1ee054d4..b566f53217 100644 --- a/src/CoreShop/Bundle/CoreBundle/Controller/ProductController.php +++ b/src/CoreShop/Bundle/CoreBundle/Controller/ProductController.php @@ -1,17 +1,20 @@ getUnitDefinition()->getId()) { + if ((int) $unitDefinitionId === $range->getUnitDefinition()->getId()) { $status = 'locked'; break 2; diff --git a/src/CoreShop/Bundle/CoreBundle/Controller/ProductVariantUnitSolidifierController.php b/src/CoreShop/Bundle/CoreBundle/Controller/ProductVariantUnitSolidifierController.php index 38b0047f03..e114b64d2f 100644 --- a/src/CoreShop/Bundle/CoreBundle/Controller/ProductVariantUnitSolidifierController.php +++ b/src/CoreShop/Bundle/CoreBundle/Controller/ProductVariantUnitSolidifierController.php @@ -1,17 +1,20 @@ getId(), $variant->getId(), - $e->getMessage() + $e->getMessage(), ); break; @@ -117,7 +120,7 @@ public function applyAction(Request $request, int $objectId): Response 'error while cloning quantity price rules from product %d to variant %d. Error was: %s', $object->getId(), $variant->getId(), - $e->getMessage() + $e->getMessage(), ); break; diff --git a/src/CoreShop/Bundle/CoreBundle/Controller/ReportsController.php b/src/CoreShop/Bundle/CoreBundle/Controller/ReportsController.php index 680db2e459..59cdd665a0 100644 --- a/src/CoreShop/Bundle/CoreBundle/Controller/ReportsController.php +++ b/src/CoreShop/Bundle/CoreBundle/Controller/ReportsController.php @@ -1,17 +1,20 @@ headers->makeDisposition( ResponseHeaderBag::DISPOSITION_ATTACHMENT, - sprintf('%s.csv', $reportType) + sprintf('%s.csv', $reportType), ); $response->headers->set('Content-Disposition', $disposition); diff --git a/src/CoreShop/Bundle/CoreBundle/Controller/SettingsController.php b/src/CoreShop/Bundle/CoreBundle/Controller/SettingsController.php index f66b3bbdd0..3c8948e340 100644 --- a/src/CoreShop/Bundle/CoreBundle/Controller/SettingsController.php +++ b/src/CoreShop/Bundle/CoreBundle/Controller/SettingsController.php @@ -1,17 +1,20 @@ getName()) . ' - ' . str_replace( ['/**', '*/', '//'], '', - $this->getTitle() + $this->getTitle(), ) . "\n"; $code .= '*' . "\n"; $code .= '* @param \CoreShop\Component\Store\Model\StoreInterface $store' . "\n"; @@ -191,7 +194,7 @@ public function getGetterCode($class) $code .= '* Get All ' . str_replace(['/**', '*/', '//'], '', $this->getName()) . ' - ' . str_replace( ['/**', '*/', '//'], '', - $this->getTitle() + $this->getTitle(), ) . "\n"; $code .= '* @return \CoreShop\Component\Core\Model\ProductStoreValuesInterface[]' . "\n"; $code .= '*/' . "\n"; @@ -206,7 +209,7 @@ public function getGetterCode($class) $code .= '* Get ' . str_replace(['/**', '*/', '//'], '', $this->getName()) . ' - ' . str_replace( ['/**', '*/', '//'], '', - $this->getTitle() + $this->getTitle(), ) . "\n"; $code .= '*' . "\n"; $code .= '* @param string $type' . "\n"; @@ -236,7 +239,7 @@ public function getSetterCode($class) $code .= '* Set ' . str_replace(['/**', '*/', '//'], '', $key) . ' - ' . str_replace( ['/**', '*/', '//'], '', - $this->getTitle() + $this->getTitle(), ) . "\n"; $code .= '*' . "\n"; $code .= '* @param \CoreShop\Component\Core\Model\ProductStoreValuesInterface $storeValues' . "\n"; @@ -254,7 +257,7 @@ public function getSetterCode($class) $code .= '* Set All ' . str_replace(['/**', '*/', '//'], '', $key) . ' - ' . str_replace( ['/**', '*/', '//'], '', - $this->getTitle() + $this->getTitle(), ) . "\n"; $code .= '*' . "\n"; $code .= '* @param \CoreShop\Component\Core\Model\ProductStoreValuesInterface[] $storeValues' . "\n"; @@ -271,7 +274,7 @@ public function getSetterCode($class) $code .= '* Set ' . str_replace(['/**', '*/', '//'], '', $key) . ' - ' . str_replace( ['/**', '*/', '//'], '', - $this->getTitle() + $this->getTitle(), ) . "\n"; $code .= '*' . "\n"; $code .= '* @param string $type' . "\n"; @@ -439,7 +442,7 @@ public function save($object, $params = []) if ($productStoreValue->getId()) { $this->getEntityManager()->getUnitOfWork()->computeChangeSet( $this->getEntityManager()->getClassMetadata($this->getProductStoreValuesRepository()->getClassName()), - $productStoreValue + $productStoreValue, ); $changeSet = $this->getEntityManager()->getUnitOfWork()->getEntityChangeSet($productStoreValue); @@ -697,7 +700,7 @@ public function getVersionPreview($data, $object = null, $params = []) $preview = []; foreach ($data as $element) { - $preview[] = (string)$element; + $preview[] = (string) $element; } return implode(', ', $preview); @@ -726,7 +729,7 @@ public function getFromCsvImport($importValue, $object = null, $params = []) throw new \InvalidArgumentException(sprintf( 'Error decoding Store Price JSON `%s`: %s', $importValue, - json_last_error_msg() + json_last_error_msg(), )); } @@ -795,7 +798,7 @@ public function isEmpty($data) protected function clearRemovedUnitDefinitions( ProductStoreValuesInterface $storeValuesEntity, Model\DataObject\Concrete $object, - array $serialized + array $serialized, ) { $unitDefinitions = $object->getObjectVar('unitDefinitions'); @@ -857,11 +860,11 @@ protected function clearRemovedUnitDefinitions( */ protected function toNumeric($value): float|int { - if (!str_contains((string)$value, '.')) { - return (int)$value; + if (!str_contains((string) $value, '.')) { + return (int) $value; } - return (float)$value; + return (float) $value; } /** @@ -873,7 +876,7 @@ protected function expandDotNotationKeys(array $array) while (count($array)) { $value = reset($array); - $key = (string)key($array); + $key = (string) key($array); unset($array[$key]); if (str_contains($key, '.')) { diff --git a/src/CoreShop/Bundle/CoreBundle/CoreShopCoreBundle.php b/src/CoreShop/Bundle/CoreBundle/CoreShopCoreBundle.php index 46c4707c92..0e19df8907 100644 --- a/src/CoreShop/Bundle/CoreBundle/CoreShopCoreBundle.php +++ b/src/CoreShop/Bundle/CoreBundle/CoreShopCoreBundle.php @@ -1,17 +1,20 @@ folderCreationService->createFolderForResource($customer, [ 'path' => ($userBackup ? 'customer' : 'guest'), 'suffix' => mb_strtoupper(mb_substr($customer->getLastname(), 0, 1)), - ]) + ]), ); /** @psalm-suppress InternalMethod */ $customer->setKey(File::getValidFilename($customer->getEmail())); @@ -72,7 +78,7 @@ public function persistCustomer(CustomerInterface $customer): void $address->setParent( $this->folderCreationService->createFolderForResource($address, [ 'prefix' => $customer->getFullPath(), - ]) + ]), ); $address->save(); } @@ -87,7 +93,7 @@ public function persistCustomer(CustomerInterface $customer): void $userBackup->setParent( $this->folderCreationService->createFolderForResource($userBackup, [ 'prefix' => $customer->getFullPath(), - ]) + ]), ); /** @psalm-suppress InternalMethod */ $userBackup->setKey(File::getValidFilename($customer->getEmail())); diff --git a/src/CoreShop/Bundle/CoreBundle/Customer/CustomerManagerInterface.php b/src/CoreShop/Bundle/CoreBundle/Customer/CustomerManagerInterface.php index ee0d810632..bd36421508 100644 --- a/src/CoreShop/Bundle/CoreBundle/Customer/CustomerManagerInterface.php +++ b/src/CoreShop/Bundle/CoreBundle/Customer/CustomerManagerInterface.php @@ -1,17 +1,20 @@ scalarNode('send_usage_log')->defaultValue(true)->end() ->scalarNode('checkout_manager_factory')->cannotBeEmpty()->end() ->scalarNode('after_logout_redirect_route')->defaultValue('coreshop_index')->cannotBeEmpty()->end() - ->end(); + ->end() + ; $this->addModelsSection($rootNode); $this->addPimcoreResourcesSection($rootNode); $this->addCheckoutConfigurationSection($rootNode); @@ -67,7 +71,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -101,7 +106,8 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addCheckoutConfigurationSection(ArrayNodeDefinition $node): void @@ -142,6 +148,7 @@ private function addCheckoutConfigurationSection(ArrayNodeDefinition $node): voi ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/DependencyInjection/CoreShopCoreExtension.php b/src/CoreShop/Bundle/CoreBundle/DependencyInjection/CoreShopCoreExtension.php index 5935e32dac..b4558a6182 100644 --- a/src/CoreShop/Bundle/CoreBundle/DependencyInjection/CoreShopCoreExtension.php +++ b/src/CoreShop/Bundle/CoreBundle/DependencyInjection/CoreShopCoreExtension.php @@ -1,17 +1,20 @@ load('services.yml'); - $env = (string)$container->getParameter('kernel.environment'); + $env = (string) $container->getParameter('kernel.environment'); if (str_contains($env, 'test')) { $loader->load('services_test.yml'); } @@ -94,10 +97,12 @@ public function load(array $configs, ContainerBuilder $container): void $container ->registerForAutoconfiguration(PortletInterface::class) - ->addTag(RegisterPortletsPass::PORTLET_TAG); + ->addTag(RegisterPortletsPass::PORTLET_TAG) + ; $container ->registerForAutoconfiguration(ReportInterface::class) - ->addTag(RegisterReportsPass::REPORT_TAG); + ->addTag(RegisterReportsPass::REPORT_TAG) + ; } public function prepend(ContainerBuilder $container): void diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CarrierRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CarrierRepository.php index af90da1c9e..968053371c 100644 --- a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CarrierRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CarrierRepository.php @@ -1,17 +1,20 @@ andWhere('o.hideFromCheckout = 0') ->setParameter('store', [$store]) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ConfigurationRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ConfigurationRepository.php index d7b3df225d..5ca34fcbaf 100644 --- a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ConfigurationRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ConfigurationRepository.php @@ -1,17 +1,20 @@ setParameter('configKey', $key) ->setParameter('store', $store) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CountryRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CountryRepository.php index 897a3cd179..1adf78d006 100644 --- a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CountryRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CountryRepository.php @@ -1,17 +1,20 @@ andWhere('o.id = :storeId') ->setParameter('storeId', $store->getId()) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CurrencyRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CurrencyRepository.php index a4a774b6f3..e7a7918716 100644 --- a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CurrencyRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/CurrencyRepository.php @@ -1,17 +1,20 @@ setParameter('storeId', $store->getId()) ->distinct() ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/PaymentProviderRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/PaymentProviderRepository.php index d1359882c2..00433c60e0 100644 --- a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/PaymentProviderRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/PaymentProviderRepository.php @@ -1,17 +1,20 @@ addOrderBy('o.position') ->setParameter('storeId', $store->getId()) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStoreValuesRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStoreValuesRepository.php index 976b601be7..7acb3ff361 100644 --- a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStoreValuesRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStoreValuesRepository.php @@ -1,17 +1,20 @@ andWhere('o.product = :product') ->setParameter('product', $product->getId()) ->getQuery() - ->getResult(); + ->getResult() + ; } public function findForProductAndStore(ProductInterface $product, StoreInterface $store): ?ProductStoreValuesInterface @@ -39,6 +43,7 @@ public function findForProductAndStore(ProductInterface $product, StoreInterface ->setParameter('product', $product->getId()) ->setParameter('store', $store) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/TaxRuleRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/TaxRuleRepository.php index c3b151bc97..bade78ccec 100644 --- a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/TaxRuleRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/TaxRuleRepository.php @@ -1,17 +1,20 @@ createQueryBuilder('o') ->andWhere('o.taxRuleGroup = :taxRuleGroup') @@ -35,6 +38,7 @@ public function findForCountryAndState( ->setParameter('country', $country ? $country->getId() : 0) ->setParameter('state', $state ? $state->getId() : 0) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Event/CustomerRegistrationEvent.php b/src/CoreShop/Bundle/CoreBundle/Event/CustomerRegistrationEvent.php index f3bea3a3d8..280792b890 100644 --- a/src/CoreShop/Bundle/CoreBundle/Event/CustomerRegistrationEvent.php +++ b/src/CoreShop/Bundle/CoreBundle/Event/CustomerRegistrationEvent.php @@ -1,17 +1,20 @@ customer = $customer; diff --git a/src/CoreShop/Bundle/CoreBundle/Event/RequestNewsletterConfirmationEvent.php b/src/CoreShop/Bundle/CoreBundle/Event/RequestNewsletterConfirmationEvent.php index 71123fe1d3..f68022b866 100644 --- a/src/CoreShop/Bundle/CoreBundle/Event/RequestNewsletterConfirmationEvent.php +++ b/src/CoreShop/Bundle/CoreBundle/Event/RequestNewsletterConfirmationEvent.php @@ -1,17 +1,20 @@ router->generate( 'coreshop_customer_confirm_newsletter', ['_locale' => $this->requestStack->getMainRequest()->getLocale()], - UrlGeneratorInterface::ABSOLUTE_URL - ) + UrlGeneratorInterface::ABSOLUTE_URL, + ), ); $this->eventDispatcher->dispatch($confirmEvent, 'coreshop.customer.request_newsletter_confirm'); } diff --git a/src/CoreShop/Bundle/CoreBundle/EventListener/CustomerOrderDeletionListener.php b/src/CoreShop/Bundle/CoreBundle/EventListener/CustomerOrderDeletionListener.php index ec91212f4c..6e49b21b89 100644 --- a/src/CoreShop/Bundle/CoreBundle/EventListener/CustomerOrderDeletionListener.php +++ b/src/CoreShop/Bundle/CoreBundle/EventListener/CustomerOrderDeletionListener.php @@ -1,17 +1,20 @@ UserTypeChecker::TYPE_PASSWORD_RESET, 'resetLink' => $event->getResetLink(), - ] + ], ); $this->rulesProcessor->applyRules('user', $user->getCustomer(), $params); @@ -66,7 +69,7 @@ public function applyRegisterCustomerRule(GenericEvent $event): void $params, [ 'type' => UserTypeChecker::TYPE_REGISTER, - ] + ], ); $this->rulesProcessor->applyRules('user', $customer, $params); @@ -91,7 +94,7 @@ public function applyNewsletterConfirmRequestRule(RequestNewsletterConfirmationE function () use ($customer) { $customer->save(); }, - false + false, ); $confirmLink = $event->getConfirmLink(); @@ -104,7 +107,7 @@ function () use ($customer) { 'type' => UserTypeChecker::TYPE_NEWSLETTER_DOUBLE_OPT_IN, 'confirmLink' => $confirmLink, 'token' => $customer->getNewsletterToken(), - ] + ], ); $this->rulesProcessor->applyRules('user', $customer, $params); @@ -129,7 +132,7 @@ public function applyNewsletterConfirmed(GenericEvent $event): void $params, [ 'type' => UserTypeChecker::TYPE_NEWSLETTER_CONFIRMED, - ] + ], ); $this->rulesProcessor->applyRules('user', $customer, $params); diff --git a/src/CoreShop/Bundle/CoreBundle/EventListener/NotificationRules/OrderCommentsListener.php b/src/CoreShop/Bundle/CoreBundle/EventListener/NotificationRules/OrderCommentsListener.php index 863991a34b..3331b9faee 100644 --- a/src/CoreShop/Bundle/CoreBundle/EventListener/NotificationRules/OrderCommentsListener.php +++ b/src/CoreShop/Bundle/CoreBundle/EventListener/NotificationRules/OrderCommentsListener.php @@ -1,17 +1,20 @@ ', $recipient->getName(), $recipient->getAddress()); } } - + $noteInstance->addData('recipient', 'text', (empty($mailTos) ? '--' : implode(', ', $mailTos))); unset($params['recipient']); diff --git a/src/CoreShop/Bundle/CoreBundle/EventListener/PriceRuleUpdateEventListener.php b/src/CoreShop/Bundle/CoreBundle/EventListener/PriceRuleUpdateEventListener.php index df8daf20ea..7813a1917c 100644 --- a/src/CoreShop/Bundle/CoreBundle/EventListener/PriceRuleUpdateEventListener.php +++ b/src/CoreShop/Bundle/CoreBundle/EventListener/PriceRuleUpdateEventListener.php @@ -1,17 +1,20 @@ setNeedsRecalculation(true); $cart->save(); }, - false + false, ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/EventListener/ProductStoreValuesAdminGetListener.php b/src/CoreShop/Bundle/CoreBundle/EventListener/ProductStoreValuesAdminGetListener.php index 67a58678ce..cb163648ad 100644 --- a/src/CoreShop/Bundle/CoreBundle/EventListener/ProductStoreValuesAdminGetListener.php +++ b/src/CoreShop/Bundle/CoreBundle/EventListener/ProductStoreValuesAdminGetListener.php @@ -1,17 +1,20 @@ storeContext->getStore(); if ($store instanceof StoreInterface) { - $request->getSession()->remove('coreshop.cart.' . $store->getId()); } diff --git a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/AddressIdentifierFixture.php b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/AddressIdentifierFixture.php index 527e2f21df..2c27c96c77 100644 --- a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/AddressIdentifierFixture.php +++ b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/AddressIdentifierFixture.php @@ -1,17 +1,20 @@ getName(), 'asset') + Service::getValidKey($usedCategory->getName(), 'asset'), )); $images = []; @@ -588,8 +591,8 @@ protected function createProduct(string $parentPath): ProductInterface $imagePath = $kernel->locateResource( sprintf( '@CoreShopCoreBundle/Resources/fixtures/image%s.jpeg', - random_int(1, 3) - ) + random_int(1, 3), + ), ); $fileName = sprintf('image_%s.jpg', uniqid()); @@ -629,7 +632,7 @@ protected function createProduct(string $parentPath): ProductInterface // $product->setWholesalePrice((int)($faker->randomFloat(2, 100, 200) * $decimalFactor)); foreach ($stores as $store) { - $product->setStoreValuesOfType('price', (int)($faker->randomFloat(2, 200, 400) * $decimalFactor), $store); + $product->setStoreValuesOfType('price', (int) ($faker->randomFloat(2, 200, 400) * $decimalFactor), $store); } $product->setTaxRule($this->getReference('taxRule')); @@ -642,7 +645,7 @@ protected function createProduct(string $parentPath): ProductInterface $product->setParent($this->container->get(ObjectServiceInterface::class)->createFolderByPath(sprintf( '/demo/%s/%s', $parentPath, - Service::getValidKey($usedCategory->getName(), 'object') + Service::getValidKey($usedCategory->getName(), 'object'), ))); $product->setPublished(true); $product->setKey($product->getName()); diff --git a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/AttributeGroupsFixture.php b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/AttributeGroupsFixture.php index f94e5494a7..00b37de207 100644 --- a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/AttributeGroupsFixture.php +++ b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/AttributeGroupsFixture.php @@ -1,17 +1,20 @@ container->get('coreshop.repository.attribute_group')->findAll())) { $data = [ 'color' => [ - 'red', 'blue', 'black' + 'red', 'blue', 'black', ], 'size' => [ - 's', 'm', 'l', 'xl' + 's', 'm', 'l', 'xl', ], 'season' => [ - 'winter', 'summer' - ] + 'winter', 'summer', + ], ]; $colorMap = [ @@ -95,13 +98,12 @@ public function load(ObjectManager $manager): void $attribute->setKey($attributeKey); $attribute->setPublished(true); $attribute->setAttributeGroup($attributeGroup); - $attribute->setSorting(($index+1)*10); + $attribute->setSorting(($index + 1) * 10); foreach (Tool::getValidLanguages() as $language) { if ($key === 'size') { $attribute->setName(strtoupper($attributeKey), $language); - } - else { + } else { $attribute->setName(ucfirst($attributeKey), $language); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/CarrierFixture.php b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/CarrierFixture.php index e175a099a3..8c8a35c7d9 100644 --- a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/CarrierFixture.php +++ b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/CarrierFixture.php @@ -1,17 +1,20 @@ 's' + 'size' => 's', ], [ - 'size' => 'm' + 'size' => 'm', ], [ - 'size' => 'l' + 'size' => 'l', ], [ - 'size' => 'xl' + 'size' => 'xl', ], ], [ [ 'color' => 'red', - 'size' => 's' + 'size' => 's', ], [ 'color' => 'red', - 'size' => 'm' + 'size' => 'm', ], [ 'color' => 'red', - 'size' => 'l' + 'size' => 'l', ], [ 'color' => 'red', - 'size' => 'xl' + 'size' => 'xl', ], [ 'color' => 'black', - 'size' => 's' + 'size' => 's', ], [ 'color' => 'black', - 'size' => 'm' + 'size' => 'm', ], [ 'color' => 'black', - 'size' => 'l' + 'size' => 'l', ], [ 'color' => 'black', - 'size' => 'xl' + 'size' => 'xl', ], [ 'color' => 'blue', - 'size' => 's' + 'size' => 's', ], [ 'color' => 'blue', - 'size' => 'm' + 'size' => 'm', ], [ 'color' => 'blue', - 'size' => 'l' + 'size' => 'l', ], [ 'color' => 'blue', - 'size' => 'xl' + 'size' => 'xl', ], ], [ @@ -230,7 +226,7 @@ public function load(ObjectManager $manager): void 'size' => 'xl', 'season' => 'summer', ], - ] + ], ]; for ($i = 0; $i < $productsCount; ++$i) { @@ -248,17 +244,17 @@ public function load(ObjectManager $manager): void $product->setAllowedAttributeGroups($allowedAttributeGroups); $product->save(); - for ($x = 0; $x < $variants; $x++) { + for ($x = 0; $x < $variants; ++$x) { if (count($variantType) === 0) { break; } - + $variantAttributesKey = array_rand($variantType); $variantAttributes = $variantType[$variantAttributesKey]; unset($variantType[$variantAttributesKey]); - $attributes = array_map(function($key, $value) { + $attributes = array_map(function ($key, $value) { if ($key === 'color') { return $this->container->get('coreshop.repository.attribute_color')->findOneBy(['name' => $value]); } diff --git a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ProductWithUnitFixture.php b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ProductWithUnitFixture.php index c368650b53..4c5869abb1 100644 --- a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ProductWithUnitFixture.php +++ b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ProductWithUnitFixture.php @@ -1,17 +1,20 @@ setStore($store); } - $storeValues->setPrice((int)$faker->randomFloat(2, 200, 400) * $decimalFactor); + $storeValues->setPrice((int) $faker->randomFloat(2, 200, 400) * $decimalFactor); /** * @var ProductUnitDefinitionPriceInterface $cartonPrice diff --git a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ShippingRuleFixture.php b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ShippingRuleFixture.php index 9dd3138be5..9535f1b81e 100644 --- a/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ShippingRuleFixture.php +++ b/src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ShippingRuleFixture.php @@ -1,17 +1,20 @@ true, 'unit_definition' => $data->hasUnitDefinition() ? $data->getUnitDefinition() : null, 'label' => 'coreshop.ui.quantity', - 'disabled' => (bool)$data->getIsGiftItem(), - ]); + 'disabled' => (bool) $data->getIsGiftItem(), + ]) + ; if (!$product->hasUnitDefinitions()) { return; diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Extension/CartTypeExtension.php b/src/CoreShop/Bundle/CoreBundle/Form/Extension/CartTypeExtension.php index 5ce683ef7d..2efd3b0874 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Extension/CartTypeExtension.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Extension/CartTypeExtension.php @@ -1,17 +1,20 @@ false, 'label' => 'coreshop.form.cart_rule.coupon', ]) - ->add('submit_voucher', SubmitType::class); + ->add('submit_voucher', SubmitType::class) + ; } public static function getExtendedTypes(): iterable diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Extension/CountryTypeExtension.php b/src/CoreShop/Bundle/CoreBundle/Form/Extension/CountryTypeExtension.php index 708d7d1c1c..8cbeb17c9d 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Extension/CountryTypeExtension.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Extension/CountryTypeExtension.php @@ -1,17 +1,20 @@ addError(new FormError('Field "starting from" in row ' . $realRowIndex . ' needs to be greater or equal than 0')); break; } - if ((float)$startingFrom <= $lastEnd) { + if ((float) $startingFrom <= $lastEnd) { $form->addError(new FormError('Field "starting from" in row ' . $realRowIndex . ' needs to be greater than ' . $lastEnd)); break; } - $lastEnd = (float)$startingFrom; + $lastEnd = (float) $startingFrom; } } }); diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Extension/ProductQuantityRangeTypeExtension.php b/src/CoreShop/Bundle/CoreBundle/Form/Extension/ProductQuantityRangeTypeExtension.php index 3492861e6e..3e50635d3f 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Extension/ProductQuantityRangeTypeExtension.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Extension/ProductQuantityRangeTypeExtension.php @@ -1,17 +1,20 @@ add('currency', CurrencyChoiceType::class, []) ->add('percentage', NumberType::class, []) ->add('pseudoPrice', MoneyType::class, []) - ->add('unitDefinition', ProductUnitDefinitionSelectionType::class, []); + ->add('unitDefinition', ProductUnitDefinitionSelectionType::class, []) + ; if ($builder->has('rangeStartingFrom')) { $builder->get('rangeStartingFrom')->addEventListener(FormEvents::PRE_SUBMIT, [$this, 'roundQuantity'], -2048); @@ -52,11 +56,11 @@ public function roundQuantity(FormEvent $event) return; } - $quantity = (float)str_replace(',', '.', $event->getData()); + $quantity = (float) str_replace(',', '.', $event->getData()); $formattedQuantity = round($quantity, $scale, \PHP_ROUND_HALF_UP); if ($quantity !== $formattedQuantity) { - $event->setData((string)$formattedQuantity); + $event->setData((string) $formattedQuantity); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Extension/StoreTypeExtension.php b/src/CoreShop/Bundle/CoreBundle/Form/Extension/StoreTypeExtension.php index baf6246795..939ca2b67e 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Extension/StoreTypeExtension.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Extension/StoreTypeExtension.php @@ -1,17 +1,20 @@ add('state', StateChoiceType::class, [ 'active' => null, 'required' => false, - ]); + ]) + ; } public static function getExtendedTypes(): iterable diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/AddressChoiceType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/AddressChoiceType.php index b09f5eca9d..20ad69082d 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/AddressChoiceType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/AddressChoiceType.php @@ -1,17 +1,20 @@ true, 'allowed_address_identifier' => [], 'placeholder' => 'coreshop.form.address.choose_address', - ] - ); + ], + ) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php index fd86e4d366..331f2fa6b4 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php @@ -1,17 +1,20 @@ 0) { $valid = count(array_filter($choiceList, static function (AddressInterface $address) use ($invoiceAddressId) { - return $address->getId() === (int)$invoiceAddressId; + return $address->getId() === (int) $invoiceAddressId; })) > 0; } } @@ -145,7 +148,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $event->getForm()->addError(new FormError($message)); } } - }); + }) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/CarrierChoiceType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/CarrierChoiceType.php index 90b248025e..5c39005093 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/CarrierChoiceType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/CarrierChoiceType.php @@ -1,17 +1,20 @@ setDefault('show_carrier_price', true) - ->setAllowedTypes('cart', OrderInterface::class); + ->setAllowedTypes('cart', OrderInterface::class) + ; } public function buildView(FormView $view, FormInterface $form, array $options): void @@ -87,7 +91,7 @@ public function buildView(FormView $view, FormInterface $form, array $options): $cart, $cart->getShippingAddress(), $this->taxationDisplayProvider->displayWithTax($context), - $context + $context, ); $prices[$choice->value] = $price; diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/CarrierType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/CarrierType.php index 0520b51236..8c67f25512 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/CarrierType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/CarrierType.php @@ -1,17 +1,20 @@ add('comment', TextareaType::class, [ 'required' => false, 'label' => 'coreshop.ui.comment', - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/GuestAddressType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/GuestAddressType.php index b35b2116e5..033e76ee48 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/GuestAddressType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/GuestAddressType.php @@ -1,17 +1,20 @@ false, 'label' => 'coreshop.form.address.use_invoice_as_shipping', - ] + ], ) ->add('invoiceAddress', AddressType::class) ->addEventListener(FormEvents::POST_SET_DATA, static function (FormEvent $event) { @@ -48,6 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) } else { $event->getForm()->get('useInvoiceAsShipping')->setData(true); } - }); + }) + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/PaymentType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/PaymentType.php index 300daaedfc..7882ef61dd 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/PaymentType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/PaymentType.php @@ -1,17 +1,20 @@ removeConfigurationFields($event->getForm()); } - }); + }) + ; $prototypes = []; foreach (array_keys($this->gatewayFactories) as $type) { @@ -91,7 +95,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $formBuilder = $builder->create( 'paymentSettings', - $this->formTypeRegistry->get($type, 'default') + $this->formTypeRegistry->get($type, 'default'), ); $prototypes[$type] = $formBuilder->getForm(); diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/SummaryType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/SummaryType.php index c5d0dc7e2a..c18a8081a8 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/SummaryType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Checkout/SummaryType.php @@ -1,17 +1,20 @@ add('submitOrder', SubmitType::class, [ 'label' => 'coreshop.ui.buy', - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/CustomerRegistrationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/CustomerRegistrationType.php index 75c6adba1c..37850ec401 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/CustomerRegistrationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/CustomerRegistrationType.php @@ -1,17 +1,20 @@ $this->validationGroups, 'constraints' => new IsTrue(['groups' => $this->validationGroups]), ]) - ->add('submit', SubmitType::class); + ->add('submit', SubmitType::class) + ; if ($this->loginIdentifier !== 'username') { $builder->addEventListener(FormEvents::SUBMIT, static function (FormEvent $event) { diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/GuestRegistrationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/GuestRegistrationType.php index 4ecf952cc9..8c0840d4f3 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/GuestRegistrationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/GuestRegistrationType.php @@ -1,17 +1,20 @@ setData($customer); } }) - ->setDataLocked(false); + ->setDataLocked(false) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/OrderMailConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/OrderMailConfigurationType.php index 505016e6f7..1c046eb365 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/OrderMailConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/OrderMailConfigurationType.php @@ -1,17 +1,20 @@ add('sendInvoices', CheckboxType::class) ->add('sendShipments', CheckboxType::class) - ->add('doNotSendToDesignatedRecipient', CheckboxType::class); + ->add('doNotSendToDesignatedRecipient', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreMailConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreMailConfigurationType.php index d0c0e00655..9a8495db72 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreMailConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreMailConfigurationType.php @@ -1,17 +1,20 @@ NumberType::class, ], ]) - ->add('doNotSendToDesignatedRecipient', CheckboxType::class); + ->add('doNotSendToDesignatedRecipient', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreOrderMailConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreOrderMailConfigurationType.php index 0a7e94fbe5..ab0160af31 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreOrderMailConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Action/StoreOrderMailConfigurationType.php @@ -1,17 +1,20 @@ add('sendInvoices', CheckboxType::class) ->add('sendShipments', CheckboxType::class) - ->add('doNotSendToDesignatedRecipient', CheckboxType::class); + ->add('doNotSendToDesignatedRecipient', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/BackendCreatedConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/BackendCreatedConfigurationType.php index fc561cc629..b5da83109d 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/BackendCreatedConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/BackendCreatedConfigurationType.php @@ -1,17 +1,20 @@ add('backendCreated', CheckboxType::class); + ->add('backendCreated', CheckboxType::class) + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/InvoiceStateConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/InvoiceStateConfigurationType.php index f953f44854..06ed99fe39 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/InvoiceStateConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/InvoiceStateConfigurationType.php @@ -1,17 +1,20 @@ add('invoiceState', TextType::class, [ - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderInvoiceStateConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderInvoiceStateConfigurationType.php index e6d02c7e4a..4a3d9c6c70 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderInvoiceStateConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderInvoiceStateConfigurationType.php @@ -1,17 +1,20 @@ add('orderInvoiceState', TextType::class, [ - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderPaymentStateConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderPaymentStateConfigurationType.php index 1ee02b1640..d1b3910e4e 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderPaymentStateConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderPaymentStateConfigurationType.php @@ -1,17 +1,20 @@ add('orderPaymentState', TextType::class, [ - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderSaleStateConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderSaleStateConfigurationType.php index 1e658e64f5..09d8c1eaf6 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderSaleStateConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderSaleStateConfigurationType.php @@ -1,17 +1,20 @@ add('saleState', TextType::class, []); + ->add('saleState', TextType::class, []) + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderShippingStateConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderShippingStateConfigurationType.php index c96295f1f9..8fe12eb3f7 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderShippingStateConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderShippingStateConfigurationType.php @@ -1,17 +1,20 @@ add('orderShippingState', TextType::class, [ - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderStateConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderStateConfigurationType.php index a5c11959c5..b5be1258da 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderStateConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/OrderStateConfigurationType.php @@ -1,17 +1,20 @@ add('orderState', TextType::class, [ - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/PaymentStateConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/PaymentStateConfigurationType.php index 6031743dba..76cd664f68 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/PaymentStateConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/PaymentStateConfigurationType.php @@ -1,17 +1,20 @@ add('paymentState', TextType::class, [ - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/QuoteStateConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/QuoteStateConfigurationType.php index e0f8d444c2..6534e9a6fb 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/QuoteStateConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/QuoteStateConfigurationType.php @@ -1,17 +1,20 @@ add('shipmentState', TextType::class, [ - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/StateTransitionConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/StateTransitionConfigurationType.php index db4906bcbb..53fe70cad2 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/StateTransitionConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/StateTransitionConfigurationType.php @@ -1,17 +1,20 @@ add('transition', TextType::class, [ - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/StoresConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/StoresConfigurationType.php index 8546057968..dab2d615cf 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/StoresConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/StoresConfigurationType.php @@ -1,17 +1,20 @@ add('stores', CollectionType::class, [ 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/UserTypeConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/UserTypeConfigurationType.php index c107453d2e..f5f4bbf23a 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/UserTypeConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Notification/Condition/UserTypeConfigurationType.php @@ -1,17 +1,20 @@ productStoreValuesRepository->find($value); - } + }, )); } @@ -49,7 +52,8 @@ public function configureOptions(OptionsResolver $resolver): void $resolver ->setDefaults([ 'csrf_protection' => false, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Product/ProductStoreValuesType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Product/ProductStoreValuesType.php index f6a5618190..dd0cb6f74f 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Product/ProductStoreValuesType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Product/ProductStoreValuesType.php @@ -1,17 +1,20 @@ add('store', StoreChoiceType::class) ->add('price', MoneyType::class) - ->add('productUnitDefinitionPrices', ProductUnitDefinitionPriceCollectionType::class); + ->add('productUnitDefinitionPrices', ProductUnitDefinitionPriceCollectionType::class) + ; } public function onPostSubmit(FormEvent $event): void diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/ProductPriceRule/Condition/QuantityConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/ProductPriceRule/Condition/QuantityConfigurationType.php index e01afef2d8..fd110416a6 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/ProductPriceRule/Condition/QuantityConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/ProductPriceRule/Condition/QuantityConfigurationType.php @@ -1,17 +1,20 @@ $this->validationGroups]), new Type(['type' => 'numeric', 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Action/FreeShippingConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Action/FreeShippingConfigurationType.php index 0be4603955..33cd64a45e 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Action/FreeShippingConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Action/FreeShippingConfigurationType.php @@ -1,17 +1,20 @@ add('carriers', CollectionType::class, [ 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CategoriesConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CategoriesConfigurationType.php index 810efa935f..45137d5042 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CategoriesConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CategoriesConfigurationType.php @@ -1,17 +1,20 @@ true, 'allow_delete' => true, ]) - ->add('recursive', CheckboxType::class); + ->add('recursive', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CommentConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CommentConfigurationType.php index 39b355e9f7..31f0c8007f 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CommentConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CommentConfigurationType.php @@ -1,17 +1,20 @@ add('commentAction', TextType::class); + ->add('commentAction', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CountriesConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CountriesConfigurationType.php index 523e88d7c6..7e06f9c073 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CountriesConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CountriesConfigurationType.php @@ -1,17 +1,20 @@ add('countries', CollectionType::class, [ 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CurrenciesConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CurrenciesConfigurationType.php index 9b1cb0c867..7f0f9d73d0 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CurrenciesConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CurrenciesConfigurationType.php @@ -1,17 +1,20 @@ add('currencies', CollectionType::class, [ 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CustomerGroupsConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CustomerGroupsConfigurationType.php index 217dc52088..81f1b5f6d9 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CustomerGroupsConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CustomerGroupsConfigurationType.php @@ -1,17 +1,20 @@ add('customerGroups', CollectionType::class, [ 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CustomersConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CustomersConfigurationType.php index 0edd8bf3b6..46ab716289 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CustomersConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/CustomersConfigurationType.php @@ -1,17 +1,20 @@ add('customers', CollectionType::class, [ 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ProductsConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ProductsConfigurationType.php index 9b79f7c643..7cfd245af0 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ProductsConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ProductsConfigurationType.php @@ -1,17 +1,20 @@ true, 'allow_delete' => true, ]) - ->add('include_variants', CheckboxType::class); + ->add('include_variants', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/StoresConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/StoresConfigurationType.php index 37a04e722a..5c42a97d36 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/StoresConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/StoresConfigurationType.php @@ -1,17 +1,20 @@ add('stores', CollectionType::class, [ 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php index 83348a8a07..077b200d4d 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php @@ -1,17 +1,20 @@ add('dateTo', NumberType::class) - ->add('dateFrom', NumberType::class); + ->add('dateFrom', NumberType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ZonesConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ZonesConfigurationType.php index f89b0a21d9..25283b117a 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ZonesConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Rule/Condition/ZonesConfigurationType.php @@ -1,17 +1,20 @@ add('zones', CollectionType::class, [ 'allow_add' => true, 'allow_delete' => true, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/AdditionAmountActionConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/AdditionAmountActionConfigurationType.php index 65947b8727..a6d1d4c6f4 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/AdditionAmountActionConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/AdditionAmountActionConfigurationType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; $builder->get('currency')->addModelTransformer(new CallbackTransformer( function (mixed $currency): mixed { @@ -60,7 +64,7 @@ function (mixed $currency): mixed { } return null; - } + }, )); } diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/DiscountAmountActionConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/DiscountAmountActionConfigurationType.php index 7b4b74fc85..42148f254f 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/DiscountAmountActionConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/DiscountAmountActionConfigurationType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; $builder->get('currency')->addModelTransformer(new CallbackTransformer( function (mixed $currency): mixed { @@ -60,7 +64,7 @@ function (mixed $currency): mixed { } return null; - } + }, )); } diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/PriceActionConfigurationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/PriceActionConfigurationType.php index c7166fe54b..96cb4decfc 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/PriceActionConfigurationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/Shipping/Rule/Action/PriceActionConfigurationType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; $builder->get('currency')->addModelTransformer(new CallbackTransformer( function (mixed $currency): mixed { @@ -56,7 +60,7 @@ function (mixed $currency): mixed { } return null; - } + }, )); } diff --git a/src/CoreShop/Bundle/CoreBundle/Form/Type/UserRegistrationType.php b/src/CoreShop/Bundle/CoreBundle/Form/Type/UserRegistrationType.php index e5fa791edd..75fb36db1c 100644 --- a/src/CoreShop/Bundle/CoreBundle/Form/Type/UserRegistrationType.php +++ b/src/CoreShop/Bundle/CoreBundle/Form/Type/UserRegistrationType.php @@ -1,17 +1,20 @@ ['label' => 'coreshop.form.user.password.label'], 'second_options' => ['label' => 'coreshop.form.user.password.confirmation'], 'invalid_message' => 'coreshop.form.user.password.must_match', - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/CoreBundle/Installer.php b/src/CoreShop/Bundle/CoreBundle/Installer.php index aec8e6c0bb..3eaab974cc 100644 --- a/src/CoreShop/Bundle/CoreBundle/Installer.php +++ b/src/CoreShop/Bundle/CoreBundle/Installer.php @@ -1,17 +1,20 @@ %s"', realpath($directory), - $this->name + $this->name, )); } } @@ -67,7 +70,7 @@ public function ensureDirectoryIsWritable(string $directory, OutputInterface $ou throw new \RuntimeException(sprintf( 'Set "%s" writable and run command "%s"', realpath(dirname($directory)), - $this->name + $this->name, )); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Installer/Executor/CommandExecutor.php b/src/CoreShop/Bundle/CoreBundle/Installer/Executor/CommandExecutor.php index 28b48b764c..b114b48a58 100644 --- a/src/CoreShop/Bundle/CoreBundle/Installer/Executor/CommandExecutor.php +++ b/src/CoreShop/Bundle/CoreBundle/Installer/Executor/CommandExecutor.php @@ -1,17 +1,20 @@ $command], $this->getDefaultParameters(), - $parameters + $parameters, ); $this->application->setAutoExit(false); diff --git a/src/CoreShop/Bundle/CoreBundle/Installer/Executor/FolderInstallerProvider.php b/src/CoreShop/Bundle/CoreBundle/Installer/Executor/FolderInstallerProvider.php index 3e0c3fcc97..42289d0335 100644 --- a/src/CoreShop/Bundle/CoreBundle/Installer/Executor/FolderInstallerProvider.php +++ b/src/CoreShop/Bundle/CoreBundle/Installer/Executor/FolderInstallerProvider.php @@ -1,17 +1,20 @@ setAttribute('iconCls', 'coreshop_nav_icon_order') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'open_order_by_number') - ->setExtra('order', 10); + ->setExtra('order', 10) + ; $menuItem->addChild('coreshop_quote_by_number') ->setLabel('coreshop_quote_by_number') @@ -49,7 +53,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_quote') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'coreshop_quote_by_number') - ->setExtra('order', 20); + ->setExtra('order', 20) + ; $menuItem->addChild('coreshop_settings') ->setLabel('coreshop_settings') @@ -57,14 +62,16 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_settings') ->setAttribute('resource', 'coreshop.core') ->setAttribute('function', 'settings') - ->setExtra('order', 30); + ->setExtra('order', 30) + ; $priceRules = $menuItem ->addChild('coreshop_pricerules') ->setLabel('coreshop_pricerules') ->setAttribute('iconCls', 'coreshop_nav_icon_price_rule') ->setAttribute('container', true) - ->setExtra('order', 40); + ->setExtra('order', 40) + ; $priceRules ->addChild('coreshop_cart_pricerules') @@ -73,7 +80,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_price_rule') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'cart_price_rule') - ->setExtra('order', 10); + ->setExtra('order', 10) + ; $priceRules ->addChild('coreshop_product_pricerules') @@ -82,14 +90,16 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_price_rule') ->setAttribute('resource', 'coreshop.product') ->setAttribute('function', 'product_price_rule') - ->setExtra('order', 20); + ->setExtra('order', 20) + ; $localization = $menuItem ->addChild('coreshop_localization') ->setLabel('coreshop_localization') ->setAttribute('iconCls', 'coreshop_nav_icon_localization') ->setAttribute('container', true) - ->setExtra('order', 50); + ->setExtra('order', 50) + ; $localization ->addChild('coreshop_countries') @@ -98,7 +108,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_country') ->setAttribute('resource', 'coreshop.address') ->setAttribute('function', 'country') - ->setExtra('order', 10); + ->setExtra('order', 10) + ; $localization ->addChild('coreshop_states') @@ -107,7 +118,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_state') ->setAttribute('resource', 'coreshop.address') ->setAttribute('function', 'state') - ->setExtra('order', 20); + ->setExtra('order', 20) + ; $localization ->addChild('coreshop_currencies') @@ -116,7 +128,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_currency') ->setAttribute('resource', 'coreshop.currency') ->setAttribute('function', 'currency') - ->setExtra('order', 30); + ->setExtra('order', 30) + ; $localization ->addChild('coreshop_exchange_rates') @@ -125,7 +138,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_exchange_rate') ->setAttribute('resource', 'coreshop.currency') ->setAttribute('function', 'exchange_rate') - ->setExtra('order', 40); + ->setExtra('order', 40) + ; $localization ->addChild('coreshop_zones') @@ -134,7 +148,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_zone') ->setAttribute('resource', 'coreshop.address') ->setAttribute('function', 'zone') - ->setExtra('order', 50); + ->setExtra('order', 50) + ; $localization ->addChild('coreshop_taxes') @@ -143,7 +158,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_taxes') ->setAttribute('resource', 'coreshop.taxation') ->setAttribute('function', 'tax_item') - ->setExtra('order', 60); + ->setExtra('order', 60) + ; $localization ->addChild('coreshop_taxrulegroups') @@ -152,14 +168,16 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_tax_rule_groups') ->setAttribute('resource', 'coreshop.taxation') ->setAttribute('function', 'tax_rule_group') - ->setExtra('order', 70); + ->setExtra('order', 70) + ; $ordersMenu = $menuItem ->addChild('coreshop_order') ->setLabel('coreshop_order') ->setAttribute('iconCls', 'coreshop_nav_icon_order') ->setAttribute('container', true) - ->setExtra('order', 60); + ->setExtra('order', 60) + ; $ordersMenu ->addChild('coreshop_orders') @@ -168,7 +186,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_orders') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'orders') - ->setExtra('order', 10); + ->setExtra('order', 10) + ; $ordersMenu ->addChild('coreshop_order_create') @@ -177,7 +196,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_order_create') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'create_order') - ->setExtra('order', 20); + ->setExtra('order', 20) + ; $ordersMenu ->addChild('coreshop_quotes') @@ -186,7 +206,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_quotes') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'quotes') - ->setExtra('order', 30); + ->setExtra('order', 30) + ; $ordersMenu ->addChild('coreshop_quote_create') @@ -195,7 +216,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_quote_create') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'create_quote') - ->setExtra('order', 40); + ->setExtra('order', 40) + ; $ordersMenu ->addChild('coreshop_carts') @@ -204,7 +226,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_carts') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'carts') - ->setExtra('order', 50); + ->setExtra('order', 50) + ; $ordersMenu ->addChild('coreshop_cart_create') @@ -213,14 +236,16 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_cart_create') ->setAttribute('resource', 'coreshop.order') ->setAttribute('function', 'create_cart') - ->setExtra('order', 60); + ->setExtra('order', 60) + ; $carriersMenu = $menuItem ->addChild('coreshop_shipping') ->setLabel('coreshop_shipping') ->setAttribute('iconCls', 'coreshop_nav_icon_shipping') ->setAttribute('container', true) - ->setExtra('order', 70); + ->setExtra('order', 70) + ; $carriersMenu ->addChild('coreshop_carriers') @@ -229,7 +254,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_carriers') ->setAttribute('resource', 'coreshop.shipping') ->setAttribute('function', 'carrier') - ->setExtra('order', 10); + ->setExtra('order', 10) + ; $carriersMenu ->addChild('coreshop_carriers_shipping_rules') @@ -238,14 +264,16 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_carrier_shipping_rule') ->setAttribute('resource', 'coreshop.shipping') ->setAttribute('function', 'shipping_rules') - ->setExtra('order', 20); + ->setExtra('order', 20) + ; $productsMenu = $menuItem ->addChild('coreshop_product') ->setLabel('coreshop_product') ->setAttribute('iconCls', 'coreshop_nav_icon_product') ->setAttribute('container', true) - ->setExtra('order', 80); + ->setExtra('order', 80) + ; $productsMenu ->addChild('coreshop_indexes') @@ -254,7 +282,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_indexes') ->setAttribute('resource', 'coreshop.index') ->setAttribute('function', 'index') - ->setExtra('order', 10); + ->setExtra('order', 10) + ; $productsMenu ->addChild('coreshop_product_units') @@ -263,7 +292,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_product_units') ->setAttribute('resource', 'coreshop.product') ->setAttribute('function', 'product_unit') - ->setExtra('order', 30); + ->setExtra('order', 30) + ; $productsMenu ->addChild('coreshop_filters') @@ -272,14 +302,16 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_filters') ->setAttribute('resource', 'coreshop.index') ->setAttribute('function', 'filter') - ->setExtra('order', 20); + ->setExtra('order', 20) + ; $customersMenu = $menuItem ->addChild('coreshop_customer') ->setLabel('coreshop_customer') ->setAttribute('iconCls', 'coreshop_nav_icon_customer') ->setAttribute('container', true) - ->setExtra('order', 81); + ->setExtra('order', 81) + ; $customersMenu ->addChild('coreshop_customers') @@ -288,7 +320,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_customers') ->setAttribute('resource', 'coreshop.customer') ->setAttribute('function', 'customers') - ->setExtra('order', 10); + ->setExtra('order', 10) + ; $customersMenu ->addChild('coreshop_customer_groups') @@ -297,7 +330,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_customer_groups') ->setAttribute('resource', 'coreshop.customer') ->setAttribute('function', 'customer_groups') - ->setExtra('order', 20); + ->setExtra('order', 20) + ; $customersMenu ->addChild('coreshop_customer_to_company_assign_to_new') @@ -306,7 +340,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_customer_to_company_assign_to_new') ->setAttribute('resource', 'coreshop.core') ->setAttribute('function', 'customer_to_company_assign_to_new') - ->setExtra('order', 30); + ->setExtra('order', 30) + ; $customersMenu ->addChild('coreshop_customer_to_company_assign_to_existing') @@ -315,7 +350,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_customer_to_company_assign_to_existing') ->setAttribute('resource', 'coreshop.core') ->setAttribute('function', 'customer_to_company_assign_to_existing') - ->setExtra('order', 40); + ->setExtra('order', 40) + ; $menuItem->addChild('coreshop_notification_rules') ->setLabel('coreshop_notification_rules') @@ -323,7 +359,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_notification_rule') ->setAttribute('resource', 'coreshop.notification') ->setAttribute('function', 'notification_rule') - ->setExtra('order', 80); + ->setExtra('order', 80) + ; $menuItem->addChild('coreshop_payment_providers') ->setLabel('coreshop_payment_providers') @@ -331,7 +368,8 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_payment_provider') ->setAttribute('resource', 'coreshop.payment') ->setAttribute('function', 'payment_provider') - ->setExtra('order', 90); + ->setExtra('order', 90) + ; $menuItem->addChild('coreshop_stores') ->setLabel('coreshop_stores') @@ -339,13 +377,15 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('iconCls', 'coreshop_nav_icon_store') ->setAttribute('resource', 'coreshop.store') ->setAttribute('function', 'store') - ->setExtra('order', 100); + ->setExtra('order', 100) + ; $menuItem->addChild('coreshop_about') ->setLabel('coreshop_about') ->setAttribute('iconCls', 'coreshop_nav_icon_logo') ->setAttribute('resource', 'coreshop.core') ->setAttribute('function', 'about') - ->setExtra('order', 1000); + ->setExtra('order', 1000) + ; } } diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20190605141526.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20190605141526.php index b54b59fe8d..2bba4b6b9a 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20190605141526.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20190605141526.php @@ -1,17 +1,20 @@ container->get('coreshop.factory.user')->createNew(); - $user->setLoginIdentifier($loginIdentifier ); + $user->setLoginIdentifier($loginIdentifier); $user->setPassword($customer->getPassword()); $user->setParent(Service::createFolderByPath(sprintf( '/%s/%s', $customer->getFullPath(), - $this->container->getParameter('coreshop.folder.user') + $this->container->getParameter('coreshop.folder.user'), ))); $user->setCustomer($customer); $user->setKey($customer->getEmail()); diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20200414153349.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20200414153349.php index 138cae8677..9262fbcfdb 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20200414153349.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20200414153349.php @@ -1,17 +1,20 @@ 'numeric', 'fieldtype' => 'numeric', 'width' => '', - 'defaultValue' => NULL, + 'defaultValue' => null, 'integer' => true, 'unsigned' => false, - 'minValue' => NULL, - 'maxValue' => NULL, + 'minValue' => null, + 'maxValue' => null, 'unique' => false, - 'decimalSize' => NULL, - 'decimalPrecision' => NULL, + 'decimalSize' => null, + 'decimalPrecision' => null, 'name' => 'convertedPaymentTotal', 'title' => 'coreshop.order.converted_payment_total', 'tooltip' => '', @@ -53,7 +56,7 @@ public function up(Schema $schema): void 'index' => false, 'locked' => false, 'style' => '', - 'permissions' => NULL, + 'permissions' => null, 'datatype' => 'data', 'relationType' => false, 'invisible' => false, @@ -258,7 +261,7 @@ public function up(Schema $schema): void $fieldBefore = $field['name']; $this->write( - sprintf('Field "%s" already found, skipping', $field['name']) + sprintf('Field "%s" already found, skipping', $field['name']), ); continue; diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20200415152607.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20200415152607.php index a4a4304e35..c9fb62e2b0 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20200415152607.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20200415152607.php @@ -1,17 +1,20 @@ 'coreshop_permission_settings', 'category' => 'coreshop_permission_group_coreshop', ]); - } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - } } diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220330151612.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220330151612.php index eb2df064dd..f7473d7c92 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220330151612.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220330151612.php @@ -2,6 +2,20 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use CoreShop\Component\Pimcore\DataObject\ClassUpdate; @@ -25,29 +39,29 @@ public function up(Schema $schema): void $classUpdater = new ClassUpdate($orderClassName); $fieldQuoteStatus = [ - "fieldtype" => "input", - "width" => null, - "queryColumnType" => "varchar", - "columnType" => "varchar", - "columnLength" => 190, - "phpdocType" => "string", - "regex" => "", - "unique" => false, - "showCharCount" => null, - "name" => "quoteState", - "title" => "coreshop.order.quote_state", - "tooltip" => "", - "mandatory" => false, - "noteditable" => true, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "relationType" => false, - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false, + 'fieldtype' => 'input', + 'width' => null, + 'queryColumnType' => 'varchar', + 'columnType' => 'varchar', + 'columnLength' => 190, + 'phpdocType' => 'string', + 'regex' => '', + 'unique' => false, + 'showCharCount' => null, + 'name' => 'quoteState', + 'title' => 'coreshop.order.quote_state', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => true, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'relationType' => false, + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, ]; if (!$classUpdater->hasField('quoteState')) { @@ -60,6 +74,5 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - } } diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220330153600.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220330153600.php index 282209518f..c19430420e 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220330153600.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220330153600.php @@ -2,6 +2,20 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use CoreShop\Component\Pimcore\DataObject\ClassUpdate; @@ -25,29 +39,29 @@ public function up(Schema $schema): void $classUpdater = new ClassUpdate($orderClassName); $fieldQuoteNumber = [ - "fieldtype" => "input", - "width" => null, - "queryColumnType" => "varchar", - "columnType" => "varchar", - "columnLength" => 190, - "phpdocType" => "string", - "regex" => "", - "unique" => false, - "showCharCount" => null, - "name" => "quoteNumber", - "title" => "coreshop.order.quote_number", - "tooltip" => "", - "mandatory" => false, - "noteditable" => true, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "relationType" => false, - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false, + 'fieldtype' => 'input', + 'width' => null, + 'queryColumnType' => 'varchar', + 'columnType' => 'varchar', + 'columnLength' => 190, + 'phpdocType' => 'string', + 'regex' => '', + 'unique' => false, + 'showCharCount' => null, + 'name' => 'quoteNumber', + 'title' => 'coreshop.order.quote_number', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => true, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'relationType' => false, + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, ]; if (!$classUpdater->hasField('quoteNumber')) { @@ -60,6 +74,5 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - } } diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220414125342.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220414125342.php index 19d3267fa9..86c7ab83e5 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220414125342.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220414125342.php @@ -2,6 +2,20 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use CoreShop\Component\Pimcore\DataObject\ClassUpdate; @@ -25,92 +39,92 @@ public function up(Schema $schema): void $classUpdater = new ClassUpdate($orderClassName); $convertedTotalGrossField = [ - "fieldtype" => "coreShopMoney", - "width" => "", - "defaultValue" => null, - "phpdocType" => "int", - "minValue" => null, - "maxValue" => null, - "name" => "convertedSubtotalGross", - "title" => "coreshop.order_item.converted_subtotal_gross", - "tooltip" => "", - "mandatory" => false, - "noteditable" => true, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "relationType" => false, - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false, + 'fieldtype' => 'coreShopMoney', + 'width' => '', + 'defaultValue' => null, + 'phpdocType' => 'int', + 'minValue' => null, + 'maxValue' => null, + 'name' => 'convertedSubtotalGross', + 'title' => 'coreshop.order_item.converted_subtotal_gross', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => true, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'relationType' => false, + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, ]; $convertedTotalNetField = [ - "fieldtype" => "coreShopMoney", - "width" => "", - "defaultValue" => null, - "phpdocType" => "int", - "minValue" => null, - "maxValue" => null, - "name" => "convertedSubtotalNet", - "title" => "coreshop.order_item.converted_subtotal_net", - "tooltip" => "", - "mandatory" => false, - "noteditable" => true, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "relationType" => false, - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false, + 'fieldtype' => 'coreShopMoney', + 'width' => '', + 'defaultValue' => null, + 'phpdocType' => 'int', + 'minValue' => null, + 'maxValue' => null, + 'name' => 'convertedSubtotalNet', + 'title' => 'coreshop.order_item.converted_subtotal_net', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => true, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'relationType' => false, + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, ]; $subtotalNetField = [ - "fieldtype" => "coreShopMoney", - "width" => "", - "defaultValue" => null, - "phpdocType" => "int", - "minValue" => null, - "maxValue" => null, - "name" => "subtotalNet", - "title" => "coreshop.order_item.subtotal_net", - "tooltip" => "", - "mandatory" => false, - "noteditable" => true, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "relationType" => false, - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false, + 'fieldtype' => 'coreShopMoney', + 'width' => '', + 'defaultValue' => null, + 'phpdocType' => 'int', + 'minValue' => null, + 'maxValue' => null, + 'name' => 'subtotalNet', + 'title' => 'coreshop.order_item.subtotal_net', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => true, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'relationType' => false, + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, ]; $subtotalGrossField = [ - "fieldtype" => "coreShopMoney", - "width" => "", - "defaultValue" => null, - "phpdocType" => "int", - "minValue" => null, - "maxValue" => null, - "name" => "subtotalGross", - "title" => "coreshop.order_item.subtotal_gross", - "tooltip" => "", - "mandatory" => false, - "noteditable" => true, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "relationType" => false, - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false, + 'fieldtype' => 'coreShopMoney', + 'width' => '', + 'defaultValue' => null, + 'phpdocType' => 'int', + 'minValue' => null, + 'maxValue' => null, + 'name' => 'subtotalGross', + 'title' => 'coreshop.order_item.subtotal_gross', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => true, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'relationType' => false, + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, ]; if (!$classUpdater->hasField('convertedSubtotalGross')) { @@ -135,6 +149,5 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - } } diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220503143220.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220503143220.php index 7d2d60ea17..24f8bf178b 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220503143220.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220503143220.php @@ -2,6 +2,20 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use CoreShop\Component\Pimcore\DataObject\ClassInstaller; diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220503144151.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220503144151.php index 1c218431fd..b295f296a0 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220503144151.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220503144151.php @@ -2,6 +2,20 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use CoreShop\Component\Pimcore\DataObject\ClassUpdate; @@ -28,118 +42,118 @@ public function up(Schema $schema): void } $attributesLayout = [ - "fieldtype" => "panel", - "layout" => null, - "border" => false, - "name" => "attributes", - "type" => null, - "region" => null, - "title" => "coreshop.product.attributes", - "width" => "", - "height" => "", - "collapsible" => false, - "collapsed" => false, - "bodyStyle" => "", - "datatype" => "layout", - "permissions" => null, - "childs" => [ + 'fieldtype' => 'panel', + 'layout' => null, + 'border' => false, + 'name' => 'attributes', + 'type' => null, + 'region' => null, + 'title' => 'coreshop.product.attributes', + 'width' => '', + 'height' => '', + 'collapsible' => false, + 'collapsed' => false, + 'bodyStyle' => '', + 'datatype' => 'layout', + 'permissions' => null, + 'childs' => [ [ - "fieldtype" => "coreShopRelation", - "stack" => "coreshop.purchasable", - "returnConcrete" => true, - "relationType" => true, - "objectsAllowed" => true, - "assetsAllowed" => false, - "documentsAllowed" => false, - "width" => null, - "assetUploadPath" => null, - "assetTypes" => [], - "documentTypes" => [], - "classes" => [ + 'fieldtype' => 'coreShopRelation', + 'stack' => 'coreshop.purchasable', + 'returnConcrete' => true, + 'relationType' => true, + 'objectsAllowed' => true, + 'assetsAllowed' => false, + 'documentsAllowed' => false, + 'width' => null, + 'assetUploadPath' => null, + 'assetTypes' => [], + 'documentTypes' => [], + 'classes' => [ [ - "classes" => "CoreShopProduct", + 'classes' => 'CoreShopProduct', ], ], - "pathFormatterClass" => "", - "name" => "mainVariant", - "title" => "Main Variant", - "tooltip" => "", - "mandatory" => false, - "noteditable" => false, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "invisible" => true, - "visibleGridView" => false, - "visibleSearch" => false, + 'pathFormatterClass' => '', + 'name' => 'mainVariant', + 'title' => 'Main Variant', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => false, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'invisible' => true, + 'visibleGridView' => false, + 'visibleSearch' => false, ], [ - "fieldtype" => "coreShopRelations", - "stack" => "coreshop.attribute_group", - "relationType" => true, - "objectsAllowed" => true, - "assetsAllowed" => false, - "documentsAllowed" => false, - "width" => null, - "height" => "", - "maxItems" => "", - "assetUploadPath" => null, - "assetTypes" => [], - "documentTypes" => [], - "enableTextSelection" => false, - "classes" => [], - "pathFormatterClass" => "", - "name" => "allowedAttributeGroups", - "title" => "coreshop.product.allowed_attribute_groups", - "tooltip" => "", - "mandatory" => false, - "noteditable" => false, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false, + 'fieldtype' => 'coreShopRelations', + 'stack' => 'coreshop.attribute_group', + 'relationType' => true, + 'objectsAllowed' => true, + 'assetsAllowed' => false, + 'documentsAllowed' => false, + 'width' => null, + 'height' => '', + 'maxItems' => '', + 'assetUploadPath' => null, + 'assetTypes' => [], + 'documentTypes' => [], + 'enableTextSelection' => false, + 'classes' => [], + 'pathFormatterClass' => '', + 'name' => 'allowedAttributeGroups', + 'title' => 'coreshop.product.allowed_attribute_groups', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => false, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, ], [ - "fieldtype" => "coreShopRelations", - "stack" => "coreshop.attribute", - "relationType" => true, - "objectsAllowed" => true, - "assetsAllowed" => false, - "documentsAllowed" => false, - "width" => null, - "height" => "", - "maxItems" => "", - "assetUploadPath" => null, - "assetTypes" => [], - "documentTypes" => [], - "enableTextSelection" => false, - "classes" => [], - "pathFormatterClass" => "", - "name" => "attributes", - "title" => "coreshop.product.attributes", - "tooltip" => "", - "mandatory" => false, - "noteditable" => false, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false, + 'fieldtype' => 'coreShopRelations', + 'stack' => 'coreshop.attribute', + 'relationType' => true, + 'objectsAllowed' => true, + 'assetsAllowed' => false, + 'documentsAllowed' => false, + 'width' => null, + 'height' => '', + 'maxItems' => '', + 'assetUploadPath' => null, + 'assetTypes' => [], + 'documentTypes' => [], + 'enableTextSelection' => false, + 'classes' => [], + 'pathFormatterClass' => '', + 'name' => 'attributes', + 'title' => 'coreshop.product.attributes', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => false, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, ], ], - "locked" => false, - "icon" => "", - "labelWidth" => 0, - "labelAlign" => "left", + 'locked' => false, + 'icon' => '', + 'labelWidth' => 0, + 'labelAlign' => 'left', ]; $classUpdater->insertLayoutAfter('details', $attributesLayout); diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220509091354.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220509091354.php index 8c4e1489aa..63fa8c6acb 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220509091354.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220509091354.php @@ -2,6 +2,20 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use Doctrine\DBAL\Schema\Schema; diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220817144912.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220817144912.php index 1c4a8cc918..24ae59f769 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220817144912.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220817144912.php @@ -2,10 +2,23 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use CoreShop\Component\Pimcore\DataObject\ClassInstallerInterface; -use CoreShop\Component\Pimcore\DataObject\ClassUpdate; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; use Pimcore\Model\DataObject\Fieldcollection\Definition; @@ -24,7 +37,7 @@ public function getDescription(): string public function up(Schema $schema): void { $fc = Definition::getByKey('CoreShopPriceRuleItem'); - + if (null !== $fc) { return; } diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220817144952.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220817144952.php index be96a9b196..404c173dfa 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220817144952.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220817144952.php @@ -2,6 +2,20 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use CoreShop\Component\Pimcore\DataObject\ClassUpdate; @@ -28,52 +42,52 @@ public function up(Schema $schema): void } $attributesLayout = [ - "fieldtype" => "panel", - "labelWidth" => 100, - "name" => "price_rules", - "type" => null, - "region" => null, - "title" => "coreshop.order.price_rules", - "width" => null, - "height" => null, - "collapsible" => false, - "collapsed" => false, - "datatype" => "layout", - "bodyStyle" => [ - "datatype" => "layout", - "permissions" => null, - "childs" => [ + 'fieldtype' => 'panel', + 'labelWidth' => 100, + 'name' => 'price_rules', + 'type' => null, + 'region' => null, + 'title' => 'coreshop.order.price_rules', + 'width' => null, + 'height' => null, + 'collapsible' => false, + 'collapsed' => false, + 'datatype' => 'layout', + 'bodyStyle' => [ + 'datatype' => 'layout', + 'permissions' => null, + 'childs' => [ [ - "fieldtype" => "fieldcollections", - "phpdocType" => "\\Pimcore\\Model\\DataObject\\Fieldcollection", - "allowedTypes" => [ - "CoreShopPriceRuleItem" + 'fieldtype' => 'fieldcollections', + 'phpdocType' => '\\Pimcore\\Model\\DataObject\\Fieldcollection', + 'allowedTypes' => [ + 'CoreShopPriceRuleItem', ], - "lazyLoading" => true, - "maxItems" => "", - "disallowAddRemove" => false, - "disallowReorder" => false, - "collapsed" => false, - "collapsible" => false, - "border" => false, - "name" => "priceRuleItems", - "title" => "coreshop.order.price_rules", - "tooltip" => "", - "mandatory" => false, - "noteditable" => true, - "index" => false, - "locked" => false, - "style" => "", - "permissions" => null, - "datatype" => "data", - "relationType" => false, - "invisible" => false, - "visibleGridView" => false, - "visibleSearch" => false - ] + 'lazyLoading' => true, + 'maxItems' => '', + 'disallowAddRemove' => false, + 'disallowReorder' => false, + 'collapsed' => false, + 'collapsible' => false, + 'border' => false, + 'name' => 'priceRuleItems', + 'title' => 'coreshop.order.price_rules', + 'tooltip' => '', + 'mandatory' => false, + 'noteditable' => true, + 'index' => false, + 'locked' => false, + 'style' => '', + 'permissions' => null, + 'datatype' => 'data', + 'relationType' => false, + 'invisible' => false, + 'visibleGridView' => false, + 'visibleSearch' => false, + ], ], - "locked" => false - ] + 'locked' => false, + ], ]; $classUpdater->insertLayoutAfter('numbers', $attributesLayout); diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220824065814.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220824065814.php index ac50692776..744d3873ed 100644 --- a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220824065814.php +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20220824065814.php @@ -2,6 +2,20 @@ declare(strict_types=1); +/* + * CoreShop + * + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. + * + * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) + * @license https://www.coreshop.org/license GPLv3 and CCL + * + */ + namespace CoreShop\Bundle\CoreBundle\Migrations; use CoreShop\Component\Pimcore\DataObject\ClassInstallerInterface; @@ -46,6 +60,5 @@ public function up(Schema $schema): void public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - } } diff --git a/src/CoreShop/Bundle/CoreBundle/Order/OrderMailProcessor.php b/src/CoreShop/Bundle/CoreBundle/Order/OrderMailProcessor.php index 70a0b4e370..a084ac5eba 100644 --- a/src/CoreShop/Bundle/CoreBundle/Order/OrderMailProcessor.php +++ b/src/CoreShop/Bundle/CoreBundle/Order/OrderMailProcessor.php @@ -1,17 +1,20 @@ storeId = $config->storeId; diff --git a/src/CoreShop/Bundle/CoreBundle/Pimcore/LinkGenerator/DataObjectLinkGenerator.php b/src/CoreShop/Bundle/CoreBundle/Pimcore/LinkGenerator/DataObjectLinkGenerator.php index 717256147d..648145889b 100644 --- a/src/CoreShop/Bundle/CoreBundle/Pimcore/LinkGenerator/DataObjectLinkGenerator.php +++ b/src/CoreShop/Bundle/CoreBundle/Pimcore/LinkGenerator/DataObjectLinkGenerator.php @@ -1,17 +1,20 @@ where('o_path LIKE :path') ->andWhere('stores LIKE :stores') ->setParameter('path', $category->getRealFullPath() . '/%') - ->setParameter('stores', '%,' . $store->getId() . ',%'); + ->setParameter('stores', '%,' . $store->getId() . ',%') + ; $childIds = []; @@ -98,12 +102,12 @@ private function setSortingForListing(Listing $list, CategoryInterface $category if (method_exists($category, 'getChildrenSortBy')) { $list->setOrderKey( sprintf('o_%s ASC', $category->getChildrenSortBy()), - false + false, ); } else { $list->setOrderKey( 'o_key ASC', - false + false, ); } } @@ -112,7 +116,7 @@ private function setSortingForListingWithoutCategory(Listing $list): void { $list->setOrderKey( 'o_index ASC, o_key ASC', - false + false, ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/CustomerRepository.php b/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/CustomerRepository.php index 302c884ed1..6bb7e1e560 100644 --- a/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/CustomerRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/CustomerRepository.php @@ -1,17 +1,20 @@ andWhere('o_type = :variant') ->setParameter('path', $product->getRealFullPath() . '/%') ->setParameter('stores', '%,' . $store->getId() . ',%') - ->setParameter('variant', 'variant'); + ->setParameter('variant', 'variant') + ; $variantIds = []; diff --git a/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/WishlistRepository.php b/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/WishlistRepository.php index 0c89f5305b..d678f1b4f5 100644 --- a/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/WishlistRepository.php +++ b/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/WishlistRepository.php @@ -1,23 +1,24 @@ getList(); $list->setCondition('customer__id = ? AND store = ?', [$customer->getId(), $store->getId()]); @@ -41,5 +42,4 @@ public function findLatestByStoreAndCustomer( return null; } - } diff --git a/src/CoreShop/Bundle/CoreBundle/Report/AbandonedCartsReport.php b/src/CoreShop/Bundle/CoreBundle/Report/AbandonedCartsReport.php index 5dea58b010..040d9e5c99 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/AbandonedCartsReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/AbandonedCartsReport.php @@ -1,17 +1,20 @@ db->fetchAllAssociative($sqlQuery, [$fromTimestamp, $toTimestamp]); - $this->totalRecords = (int)$this->db->fetchOne('SELECT FOUND_ROWS()'); + $this->totalRecords = (int) $this->db->fetchOne('SELECT FOUND_ROWS()'); foreach ($data as &$entry) { $entry['itemsInCart'] = count(array_filter(explode(',', $entry['items']))); diff --git a/src/CoreShop/Bundle/CoreBundle/Report/CarriersReport.php b/src/CoreShop/Bundle/CoreBundle/Report/CarriersReport.php index d29d187074..eb558047da 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/CarriersReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/CarriersReport.php @@ -1,17 +1,20 @@ $carrier instanceof CarrierInterface ? $carrier->getIdentifier() : $result['carrier'], - 'data' => (float)$result['percentage'], + 'data' => (float) $result['percentage'], ]; } diff --git a/src/CoreShop/Bundle/CoreBundle/Report/CartsReport.php b/src/CoreShop/Bundle/CoreBundle/Report/CartsReport.php index ab3e2121a5..7f5769e7ba 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/CartsReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/CartsReport.php @@ -1,17 +1,20 @@ ? AND orders.orderDate < ? AND orderItems.product__id IS NOT NULL + WHERE orders.store = $storeId" . (($orderStateFilter !== null) ? ' AND `orders`.orderState IN (' . rtrim(str_repeat('?,', count($orderStateFilter)), ',') . ')' : '') . " AND orders.orderDate > ? AND orders.orderDate < ? AND orderItems.product__id IS NOT NULL GROUP BY categories.oo_id ORDER BY quantityCount DESC LIMIT $offset,$limit"; $queryParameters = []; - if($orderStateFilter !== null) { + if ($orderStateFilter !== null) { array_push($queryParameters, ...$orderStateFilter); } $queryParameters[] = $from->getTimestamp(); $queryParameters[] = $to->getTimestamp(); $results = $this->db->fetchAllAssociative($query, $queryParameters); - if(count($results) === 0) { + if (count($results) === 0) { // when products get assigned to category $query = " SELECT SQL_CALC_FOUND_ROWS @@ -111,19 +120,19 @@ public function getReportData(ParameterBag $parameterBag): array SUM(orderItems.quantity) AS `quantityCount`, COUNT(orderItems.product__id) AS `orderCount` FROM object_$categoryClassId AS categories - INNER JOIN object_localized_query_".$categoryClassId.'_'.$locale." AS localizedCategories ON localizedCategories.ooo_id = categories.oo_id + INNER JOIN object_localized_query_" . $categoryClassId . '_' . $locale . " AS localizedCategories ON localizedCategories.ooo_id = categories.oo_id INNER JOIN dependencies AS catProductDependencies ON catProductDependencies.sourceId = categories.oo_id AND catProductDependencies.sourcetype = \"object\" INNER JOIN object_query_$orderItemClassId AS orderItems ON orderItems.product__id = catProductDependencies.targetId INNER JOIN object_relations_$orderClassId AS orderRelations ON orderRelations.dest_id = orderItems.oo_id AND orderRelations.fieldname = \"items\" INNER JOIN object_query_$orderClassId AS `orders` ON `orders`.oo_id = orderRelations.src_id - WHERE orders.store = $storeId".(($orderStateFilter !== null) ? ' AND `orders`.orderState IN ('.rtrim(str_repeat('?,', count($orderStateFilter)), ',').')' : '')." AND orders.orderDate > ? AND orders.orderDate < ? AND orderItems.product__id IS NOT NULL + WHERE orders.store = $storeId" . (($orderStateFilter !== null) ? ' AND `orders`.orderState IN (' . rtrim(str_repeat('?,', count($orderStateFilter)), ',') . ')' : '') . " AND orders.orderDate > ? AND orders.orderDate < ? AND orderItems.product__id IS NOT NULL GROUP BY categories.oo_id ORDER BY quantityCount DESC LIMIT $offset,$limit"; $results = $this->db->fetchAllAssociative($query, $queryParameters); } - $this->totalRecords = (int)$this->db->fetchOne('SELECT FOUND_ROWS()'); + $this->totalRecords = (int) $this->db->fetchOne('SELECT FOUND_ROWS()'); $data = []; foreach ($results as $result) { @@ -135,8 +144,8 @@ public function getReportData(ParameterBag $parameterBag): array 'profit' => $result['profit'], 'quantityCount' => $result['quantityCount'], 'orderCount' => $result['orderCount'], - 'salesFormatted' => $this->moneyFormatter->format((int)$result['sales'], $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode()), - 'profitFormatted' => $this->moneyFormatter->format((int)$result['profit'], $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode()), + 'salesFormatted' => $this->moneyFormatter->format((int) $result['sales'], $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode()), + 'profitFormatted' => $this->moneyFormatter->format((int) $result['profit'], $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode()), ]; } diff --git a/src/CoreShop/Bundle/CoreBundle/Report/CustomersReport.php b/src/CoreShop/Bundle/CoreBundle/Report/CustomersReport.php index 484cd77e4f..71e35aad77 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/CustomersReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/CustomersReport.php @@ -1,17 +1,20 @@ db->fetchAllAssociative($query, [$from->getTimestamp(), $to->getTimestamp()]); - $this->totalRecords = (int)$this->db->fetchOne('SELECT FOUND_ROWS()'); + $this->totalRecords = (int) $this->db->fetchOne('SELECT FOUND_ROWS()'); foreach ($results as &$result) { $result['salesFormatted'] = $this->moneyFormatter->format( - (int)$result['sales'], + (int) $result['sales'], 'EUR', - $this->localeContext->getLocaleCode() + $this->localeContext->getLocaleCode(), ); } diff --git a/src/CoreShop/Bundle/CoreBundle/Report/ManufacturerReport.php b/src/CoreShop/Bundle/CoreBundle/Report/ManufacturerReport.php index c55d71e707..a4d66704dd 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/ManufacturerReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/ManufacturerReport.php @@ -1,17 +1,20 @@ getFieldDefinition('name')) { + if (!$manufacturerClass->getFieldDefinition('name')) { $localizedFields = $manufacturerClass->getFieldDefinition('localizedfields'); - if($localizedFields instanceof ClassDefinition\Data\Localizedfields && $localizedFields->getFieldDefinition('name')) { + if ($localizedFields instanceof ClassDefinition\Data\Localizedfields && $localizedFields->getFieldDefinition('name')) { $nameIsLocalized = true; } } - $query = " + $query = ' SELECT SQL_CALC_FOUND_ROWS `manufacturers`.oo_id as manufacturerId, `manufacturers`.name as manufacturerName, @@ -86,12 +95,12 @@ public function getReportData(ParameterBag $parameterBag): array SUM((orderItems.itemRetailPriceNet - orderItems.itemWholesalePrice) * orderItems.quantity) AS profit, SUM(orderItems.quantity) AS `quantityCount`, COUNT(orderItems.product__id) AS `orderCount` - FROM ".($nameIsLocalized ? 'object_localized_'.$manufacturerClassId.'_'.$this->localeService->getLocaleCode() : 'object_'.$manufacturerClassId)." AS manufacturers + FROM ' . ($nameIsLocalized ? 'object_localized_' . $manufacturerClassId . '_' . $this->localeService->getLocaleCode() : 'object_' . $manufacturerClassId) . " AS manufacturers INNER JOIN dependencies AS manProductDependencies ON manProductDependencies.targetId = manufacturers.oo_id AND manProductDependencies.targettype = \"object\" INNER JOIN object_query_$orderItemClassId AS orderItems ON orderItems.product__id = manProductDependencies.sourceid INNER JOIN object_relations_$orderClassId AS orderRelations ON orderRelations.dest_id = orderItems.oo_id AND orderRelations.fieldname = \"items\" INNER JOIN object_query_$orderClassId AS `orders` ON `orders`.oo_id = orderRelations.src_id - WHERE orders.store = $storeId".(($orderStateFilter !== null) ? " AND `orders`.orderState IN (".rtrim(str_repeat('?,', count($orderStateFilter)), ',').")" : "")." AND orders.orderDate > ? AND orders.orderDate < ? AND orderItems.product__id IS NOT NULL + WHERE orders.store = $storeId" . (($orderStateFilter !== null) ? ' AND `orders`.orderState IN (' . rtrim(str_repeat('?,', count($orderStateFilter)), ',') . ')' : '') . " AND orders.orderDate > ? AND orders.orderDate < ? AND orderItems.product__id IS NOT NULL GROUP BY manufacturers.oo_id ORDER BY quantityCount DESC LIMIT $offset,$limit"; @@ -104,7 +113,7 @@ public function getReportData(ParameterBag $parameterBag): array $queryParameters[] = $to->getTimestamp(); $results = $this->db->fetchAllAssociative($query, $queryParameters); - $this->totalRecords = (int)$this->db->fetchOne('SELECT FOUND_ROWS()'); + $this->totalRecords = (int) $this->db->fetchOne('SELECT FOUND_ROWS()'); $data = []; foreach ($results as $result) { @@ -116,8 +125,8 @@ public function getReportData(ParameterBag $parameterBag): array 'profit' => $result['profit'], 'quantityCount' => $result['quantityCount'], 'orderCount' => $result['orderCount'], - 'salesFormatted' => $this->moneyFormatter->format((int)$result['sales'], $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode()), - 'profitFormatted' => $this->moneyFormatter->format((int)$result['profit'], $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode()), + 'salesFormatted' => $this->moneyFormatter->format((int) $result['sales'], $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode()), + 'profitFormatted' => $this->moneyFormatter->format((int) $result['profit'], $store->getCurrency()->getIsoCode(), $this->localeService->getLocaleCode()), ]; } diff --git a/src/CoreShop/Bundle/CoreBundle/Report/PaymentProvidersReport.php b/src/CoreShop/Bundle/CoreBundle/Report/PaymentProvidersReport.php index 96118a06ca..6d55a14a0b 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/PaymentProvidersReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/PaymentProvidersReport.php @@ -1,17 +1,20 @@ $paymentProvider instanceof PaymentProviderInterface ? $paymentProvider->getTitle() : 'unkown', - 'data' => (float)$result['percentage'], + 'data' => (float) $result['percentage'], ]; } diff --git a/src/CoreShop/Bundle/CoreBundle/Report/ProductsReport.php b/src/CoreShop/Bundle/CoreBundle/Report/ProductsReport.php index 47eb978467..0824e25623 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/ProductsReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/ProductsReport.php @@ -1,17 +1,20 @@ get('to', strtotime(date('t-m-Y'))); $objectTypeFilter = $parameterBag->get('objectType', 'all'); $orderStateFilter = $parameterBag->get('orderState'); - if($orderStateFilter) { + if ($orderStateFilter) { $orderStateFilter = \json_decode($orderStateFilter, true); } @@ -95,7 +103,7 @@ public function getReportData(ParameterBag $parameterBag): array INNER JOIN object_query_$orderItemClassId AS orderItems ON products.o_id = orderItems.mainObjectId INNER JOIN object_relations_$orderClassId AS orderRelations ON orderRelations.dest_id = orderItems.oo_id AND orderRelations.fieldname = \"items\" INNER JOIN object_query_$orderClassId AS `order` ON `order`.oo_id = orderRelations.src_id - WHERE products.o_type = 'object' AND `order`.store = $storeId".(($orderStateFilter !== null) ? " AND `order`.orderState IN (".rtrim(str_repeat('?,', count($orderStateFilter)), ',').")":"")." AND `order`.orderDate > ? AND `order`.orderDate < ? + WHERE products.o_type = 'object' AND `order`.store = $storeId" . (($orderStateFilter !== null) ? ' AND `order`.orderState IN (' . rtrim(str_repeat('?,', count($orderStateFilter)), ',') . ')' : '') . " AND `order`.orderDate > ? AND `order`.orderDate < ? GROUP BY products.o_id LIMIT $offset,$limit"; } else { @@ -121,7 +129,7 @@ public function getReportData(ParameterBag $parameterBag): array INNER JOIN object_relations_$orderClassId AS orderRelations ON orderRelations.src_id = orders.oo_id AND orderRelations.fieldname = \"items\" INNER JOIN object_query_$orderItemClassId AS orderItems ON orderRelations.dest_id = orderItems.oo_id INNER JOIN object_localized_query_" . $orderItemClassId . '_' . $locale . " AS orderItemsTranslated ON orderItems.oo_id = orderItemsTranslated.ooo_id - WHERE `orders`.store = $storeId AND $productTypeCondition".(($orderStateFilter !== null) ? " AND `orders`.orderState IN (".rtrim(str_repeat('?,', count($orderStateFilter)),',').")" : "")." AND `orders`.orderDate > ? AND `orders`.orderDate < ? + WHERE `orders`.store = $storeId AND $productTypeCondition" . (($orderStateFilter !== null) ? ' AND `orders`.orderState IN (' . rtrim(str_repeat('?,', count($orderStateFilter)), ',') . ')' : '') . " AND `orders`.orderDate > ? AND `orders`.orderDate < ? GROUP BY orderItems.objectId ORDER BY orderCount DESC LIMIT $offset,$limit"; @@ -132,15 +140,14 @@ public function getReportData(ParameterBag $parameterBag): array $queryParameters[] = $from->getTimestamp(); $queryParameters[] = $to->getTimestamp(); - $productSales = $this->db->fetchAllAssociative($query, $queryParameters); - $this->totalRecords = (int)$this->db->fetchOne('SELECT FOUND_ROWS()'); + $this->totalRecords = (int) $this->db->fetchOne('SELECT FOUND_ROWS()'); foreach ($productSales as &$sale) { - $sale['salesPriceFormatted'] = $this->moneyFormatter->format((int)$sale['salesPrice'], $store->getCurrency()->getIsoCode(), $locale); - $sale['salesFormatted'] = $this->moneyFormatter->format((int)$sale['sales'], $store->getCurrency()->getIsoCode(), $locale); - $sale['profitFormatted'] = $this->moneyFormatter->format((int)$sale['profit'], $store->getCurrency()->getIsoCode(), $locale); + $sale['salesPriceFormatted'] = $this->moneyFormatter->format((int) $sale['salesPrice'], $store->getCurrency()->getIsoCode(), $locale); + $sale['salesFormatted'] = $this->moneyFormatter->format((int) $sale['sales'], $store->getCurrency()->getIsoCode(), $locale); + $sale['profitFormatted'] = $this->moneyFormatter->format((int) $sale['profit'], $store->getCurrency()->getIsoCode(), $locale); $sale['name'] = $sale['productName'] . ' (Id: ' . $sale['productId'] . ')'; } diff --git a/src/CoreShop/Bundle/CoreBundle/Report/SalesReport.php b/src/CoreShop/Bundle/CoreBundle/Report/SalesReport.php index e4f3e908cd..ee4313a050 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/SalesReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/SalesReport.php @@ -1,17 +1,20 @@ $date->getTimestamp(), 'datetext' => $date->format($dateFormatter), 'sales' => $result['total'], - 'salesFormatted' => $this->moneyFormatter->format((int)$result['total'], $store->getCurrency()->getIsoCode(), $this->localeContext->getLocaleCode()), + 'salesFormatted' => $this->moneyFormatter->format((int) $result['total'], $store->getCurrency()->getIsoCode(), $this->localeContext->getLocaleCode()), ]; } diff --git a/src/CoreShop/Bundle/CoreBundle/Report/VouchersReport.php b/src/CoreShop/Bundle/CoreBundle/Report/VouchersReport.php index 3fa9f974a3..4f1355a4fd 100644 --- a/src/CoreShop/Bundle/CoreBundle/Report/VouchersReport.php +++ b/src/CoreShop/Bundle/CoreBundle/Report/VouchersReport.php @@ -1,17 +1,20 @@ db->fetchAllAssociative($sqlQuery, [$from->getTimestamp(), $to->getTimestamp()]); - $this->totalRecords = (int)$this->db->fetchOne('SELECT FOUND_ROWS()'); + $this->totalRecords = (int) $this->db->fetchOne('SELECT FOUND_ROWS()'); foreach ($results as $result) { $date = Carbon::createFromTimestamp($result['orderDate']); @@ -83,7 +91,7 @@ public function getReportData(ParameterBag $parameterBag): array 'usedDate' => $date->getTimestamp(), 'code' => $result['code'], 'rule' => !empty($result['rule']) ? $result['rule'] : '--', - 'discount' => $this->moneyFormatter->format((int)$result['discount'], $store->getCurrency()->getIsoCode(), $this->localeContext->getLocaleCode()), + 'discount' => $this->moneyFormatter->format((int) $result['discount'], $store->getCurrency()->getIsoCode(), $this->localeContext->getLocaleCode()), ]; } diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/css/core.css b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/css/core.css index 006178b5ac..2d29e8d243 100644 --- a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/css/core.css +++ b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/css/core.css @@ -1,13 +1,17 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ + .td-icon { } diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopStoreValues.js b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopStoreValues.js index d3ebfd4c8d..2f3c17f3b4 100755 --- a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopStoreValues.js +++ b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopStoreValues.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.classes.data.coreShopStoreValues'); diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStoreValues.js b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStoreValues.js index 59f2eba21d..1e87a1ed33 100755 --- a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStoreValues.js +++ b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStoreValues.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.tags.coreShopStoreValues'); diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/builder.js b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/builder.js index b6e6196d10..51ce40b782 100644 --- a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/builder.js +++ b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/builder.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('coreshop.product.storeValues.builder'); diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/items/price.js b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/items/price.js index 2bb70be0ee..cc0c73ed20 100644 --- a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/items/price.js +++ b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/items/price.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('coreshop.product.storeValues.items.price'); diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/items/unitPrice.js b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/items/unitPrice.js index 33f6c63897..494897f837 100644 --- a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/items/unitPrice.js +++ b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/storevalues/items/unitPrice.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('coreshop.product.storeValues.items.unitPrice'); diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/units/builder.js b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/units/builder.js index 576d0f2f75..35a8b6e839 100644 --- a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/units/builder.js +++ b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/product/units/builder.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ coreshop.product.unit.builder = Class.create(coreshop.product.unit.builder, { diff --git a/src/CoreShop/Bundle/CoreBundle/Security/AccessVoter.php b/src/CoreShop/Bundle/CoreBundle/Security/AccessVoter.php index c817c020f1..417c32d57c 100644 --- a/src/CoreShop/Bundle/CoreBundle/Security/AccessVoter.php +++ b/src/CoreShop/Bundle/CoreBundle/Security/AccessVoter.php @@ -1,17 +1,21 @@ getResponse(); foreach ($this->responseCookies as $name => $value) { - $response->headers->setCookie(new Cookie($name, (string)$value)); + $response->headers->setCookie(new Cookie($name, (string) $value)); } $this->requestCookies = new ParameterBag(); diff --git a/src/CoreShop/Bundle/CoreBundle/Storage/SessionStorage.php b/src/CoreShop/Bundle/CoreBundle/Storage/SessionStorage.php index fdffe48bd7..c92aee5780 100644 --- a/src/CoreShop/Bundle/CoreBundle/Storage/SessionStorage.php +++ b/src/CoreShop/Bundle/CoreBundle/Storage/SessionStorage.php @@ -1,17 +1,20 @@ attributes->get('stepIdentifier'); @@ -106,8 +109,8 @@ public function getStep(string $type = ''): ?string sprintf( 'invalid identifier guess "%s", available guesses are: %s', $type, - implode(', ', $validGuesser) - ) + implode(', ', $validGuesser), + ), ); } @@ -121,6 +124,7 @@ public function getStep(string $type = ''): ?string /** * @var string|null $stepIdentifier + * * @psalm-var string|null $stepIdentifier */ $stepIdentifier = $request->attributes->get('stepIdentifier'); @@ -131,11 +135,12 @@ public function getStep(string $type = ''): ?string protected function getPreviousStepIdentifier( OrderInterface $cart, ?string $stepIdentifier, - CheckoutManagerInterface $checkoutManager + CheckoutManagerInterface $checkoutManager, ): ?string { $request = $this->requestStack->getMainRequest(); /** * @var string|null $previousIdentifier + * * @psalm-var string|null $previousIdentifier */ $previousIdentifier = $request->attributes->get('stepIdentifier'); @@ -154,7 +159,7 @@ protected function getPreviousStepIdentifier( protected function getCurrentStepIdentifier( OrderInterface $cart, ?string $stepIdentifier, - CheckoutManagerInterface $checkoutManager + CheckoutManagerInterface $checkoutManager, ): ?string { return $stepIdentifier; } @@ -162,7 +167,7 @@ protected function getCurrentStepIdentifier( protected function getFirstStepIdentifier( OrderInterface $cart, ?string $stepIdentifier, - CheckoutManagerInterface $checkoutManager + CheckoutManagerInterface $checkoutManager, ): string { $steps = $checkoutManager->getSteps(); @@ -172,7 +177,7 @@ protected function getFirstStepIdentifier( protected function getLastStepIdentifier( OrderInterface $cart, ?string $stepIdentifier, - CheckoutManagerInterface $checkoutManager + CheckoutManagerInterface $checkoutManager, ): string { $steps = $checkoutManager->getSteps(); @@ -182,7 +187,7 @@ protected function getLastStepIdentifier( protected function getNextStepIdentifier( OrderInterface $cart, ?string $stepIdentifier, - CheckoutManagerInterface $checkoutManager + CheckoutManagerInterface $checkoutManager, ): ?string { $identifier = null; diff --git a/src/CoreShop/Bundle/CoreBundle/Twig/ConfigurationExtension.php b/src/CoreShop/Bundle/CoreBundle/Twig/ConfigurationExtension.php index 5262cbfdbb..306a23c4e5 100644 --- a/src/CoreShop/Bundle/CoreBundle/Twig/ConfigurationExtension.php +++ b/src/CoreShop/Bundle/CoreBundle/Twig/ConfigurationExtension.php @@ -1,17 +1,20 @@ purchasableCalculator->getPrice($product, $context); $price = $this->quantityReferenceDetector->detectRangePrice($product, $range, $realItemPrice, $context); diff --git a/src/CoreShop/Bundle/CoreBundle/Twig/ProductTaxExtension.php b/src/CoreShop/Bundle/CoreBundle/Twig/ProductTaxExtension.php index a2101dde51..8b7653df2f 100644 --- a/src/CoreShop/Bundle/CoreBundle/Twig/ProductTaxExtension.php +++ b/src/CoreShop/Bundle/CoreBundle/Twig/ProductTaxExtension.php @@ -1,17 +1,20 @@ availabilityChecker->isStockSufficient( $purchasable, - $cartItem->getDefaultUnitQuantity() + $this->getExistingCartItemQuantityFromCart($cart, $cartItem) + $cartItem->getDefaultUnitQuantity() + $this->getExistingCartItemQuantityFromCart($cart, $cartItem), ); if (!$isStockSufficient) { $this->context->addViolation( $constraint->message, - ['%stockable%' => $purchasable->getInventoryName()] + ['%stockable%' => $purchasable->getInventoryName()], ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/AddToCartMaximumQuantity.php b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/AddToCartMaximumQuantity.php index c750b75fad..5d0e9f95a5 100644 --- a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/AddToCartMaximumQuantity.php +++ b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/AddToCartMaximumQuantity.php @@ -1,17 +1,20 @@ $purchasable->getInventoryName(), '%limit%' => $maxLimit, - ] + ], ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/AddToCartMinimumQuantity.php b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/AddToCartMinimumQuantity.php index 00d4da5b0b..2f2ffeba97 100644 --- a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/AddToCartMinimumQuantity.php +++ b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/AddToCartMinimumQuantity.php @@ -1,17 +1,20 @@ $purchasable->getInventoryName(), '%limit%' => $minLimit, - ] + ], ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartMaximumQuantity.php b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartMaximumQuantity.php index 0d3eb0745b..6b08350d28 100644 --- a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartMaximumQuantity.php +++ b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartMaximumQuantity.php @@ -1,17 +1,20 @@ getMaximumQuantityToOrder(); $higherThenMaximum = $this->quantityValidatorService->isHigherThenMaxLimit( $maxLimit, - $this->getExistingCartItemQuantityFromCart($value, $cartItem) + $this->getExistingCartItemQuantityFromCart($value, $cartItem), ); $productsChecked[] = $product->getId(); @@ -90,7 +93,7 @@ public function validate($value, Constraint $constraint): void [ '%stockable%' => $invalidProduct->getInventoryName(), '%limit%' => $maxLimit, - ] + ], ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartMinimumQuantity.php b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartMinimumQuantity.php index de2e79450e..3c03992f2a 100644 --- a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartMinimumQuantity.php +++ b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartMinimumQuantity.php @@ -1,17 +1,20 @@ getMinimumQuantityToOrder(); $lowerThenMinimum = $this->quantityValidatorService->isLowerThenMinLimit( $minLimit, - $this->getExistingCartItemQuantityFromCart($value, $cartItem) + $this->getExistingCartItemQuantityFromCart($value, $cartItem), ); if (!in_array($product->getId(), $productsChecked, true)) { @@ -92,7 +95,7 @@ public function validate($value, Constraint $constraint): void [ '%stockable%' => $invalidProduct->getInventoryName(), '%limit%' => $minLimit, - ] + ], ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartStockAvailability.php b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartStockAvailability.php index 24f5db3d9f..d377620f36 100644 --- a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartStockAvailability.php +++ b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/CartStockAvailability.php @@ -1,17 +1,20 @@ availabilityChecker->isStockSufficient( $product, - $this->getExistingCartItemQuantityFromCart($value, $cartItem) + $this->getExistingCartItemQuantityFromCart($value, $cartItem), ); $productsChecked[] = $product->getId(); @@ -72,7 +75,7 @@ public function validate($value, Constraint $constraint): void if (!$isStockSufficient && $insufficientProduct instanceof StockableInterface) { $this->context->addViolation( $constraint->message, - ['%stockable%' => $insufficientProduct->getInventoryName()] + ['%stockable%' => $insufficientProduct->getInventoryName()], ); } } diff --git a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/QuantityRangePriceCurrencyAware.php b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/QuantityRangePriceCurrencyAware.php index aae5910c0a..8cca33f8db 100644 --- a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/QuantityRangePriceCurrencyAware.php +++ b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/QuantityRangePriceCurrencyAware.php @@ -1,17 +1,20 @@ getCurrency() instanceof CurrencyInterface) { $this->context->buildViolation($constraint->message) ->setParameter('{{ rangeStartingFrom }}', sprintf('Range starting from %d', $value->getRangeStartingFrom())) - ->addViolation(); + ->addViolation() + ; } } } diff --git a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php index c6b26b90b2..c1fceb7d50 100644 --- a/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php +++ b/src/CoreShop/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php @@ -1,17 +1,20 @@ getCurrency()) { - $currency = $this->getCurrencyById((int)$data->getCurrency()->getId()); + $currency = $this->getCurrencyById((int) $data->getCurrency()->getId()); return new Money($data->getValue(), $currency); } @@ -177,7 +180,7 @@ public function getDataFromResource($data, $object = null, $params = []) $currency = $this->getCurrencyById($data[$this->getName() . '__currency']); if (null !== $currency) { - return new \CoreShop\Component\Currency\Model\Money((int)($data[$this->getName() . '__value'] ?? 0), $currency); + return new \CoreShop\Component\Currency\Model\Money((int) ($data[$this->getName() . '__value'] ?? 0), $currency); } } @@ -237,19 +240,19 @@ public function checkValidity($data, $omitMandatoryCheck = false, $params = []) if (!$this->isEmpty($data) && !$omitMandatoryCheck) { if ($data->getValue() >= \PHP_INT_MAX) { throw new Model\Element\ValidationException( - 'Value exceeds PHP_INT_MAX please use an input data type instead of numeric!' + 'Value exceeds PHP_INT_MAX please use an input data type instead of numeric!', ); } - if ((string)$this->getMinValue() !== '' && $this->getMinValue() > $data->getValue()) { + if ((string) $this->getMinValue() !== '' && $this->getMinValue() > $data->getValue()) { throw new Model\Element\ValidationException( - 'Value in field [ ' . $this->getName() . ' ] is not at least ' . $this->getMinValue() + 'Value in field [ ' . $this->getName() . ' ] is not at least ' . $this->getMinValue(), ); } - if ((string)$this->getMaxValue() !== '' && $data->getValue() > $this->getMaxValue()) { + if ((string) $this->getMaxValue() !== '' && $data->getValue() > $this->getMaxValue()) { throw new Model\Element\ValidationException( - 'Value in field [ ' . $this->getName() . ' ] is bigger than ' . $this->getMaxValue() + 'Value in field [ ' . $this->getName() . ' ] is bigger than ' . $this->getMaxValue(), ); } } @@ -326,6 +329,6 @@ protected function getDecimalFactor() */ protected function toNumeric($value): float|int { - return (int)round($value * $this->getDecimalFactor()); + return (int) round($value * $this->getDecimalFactor()); } } diff --git a/src/CoreShop/Bundle/CurrencyBundle/CoreShopCurrencyBundle.php b/src/CoreShop/Bundle/CurrencyBundle/CoreShopCurrencyBundle.php index 54be747347..07ba41b249 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/CoreShopCurrencyBundle.php +++ b/src/CoreShop/Bundle/CurrencyBundle/CoreShopCurrencyBundle.php @@ -1,17 +1,20 @@ doctrineProvider = $doctrineProvider; @@ -47,7 +53,7 @@ public function getGraphQlFieldConfig($attribute, Data $fieldDefinition, $class 'type' => $this->getFieldType($fieldDefinition, $class, $container), 'resolve' => $this->getResolver($attribute, $fieldDefinition, $class), ], - $container + $container, ); } diff --git a/src/CoreShop/Bundle/CurrencyBundle/DependencyInjection/Compiler/CompositeCurrencyContextPass.php b/src/CoreShop/Bundle/CurrencyBundle/DependencyInjection/Compiler/CompositeCurrencyContextPass.php index 5fbbe6e34b..b9f15862ea 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/DependencyInjection/Compiler/CompositeCurrencyContextPass.php +++ b/src/CoreShop/Bundle/CurrencyBundle/DependencyInjection/Compiler/CompositeCurrencyContextPass.php @@ -1,17 +1,20 @@ children() ->integerNode('money_decimal_factor')->defaultValue(100)->end() ->integerNode('money_decimal_precision')->defaultValue(2)->end() - ->end(); + ->end() + ; $this->addModelsSection($rootNode); $this->addPimcoreResourcesSection($rootNode); @@ -93,7 +97,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -124,6 +129,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/CurrencyBundle/DependencyInjection/CoreShopCurrencyExtension.php b/src/CoreShop/Bundle/CurrencyBundle/DependencyInjection/CoreShopCurrencyExtension.php index f73e0f1caf..e0677c5455 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/DependencyInjection/CoreShopCurrencyExtension.php +++ b/src/CoreShop/Bundle/CurrencyBundle/DependencyInjection/CoreShopCurrencyExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(CurrencyContextInterface::class) - ->addTag(CompositeCurrencyContextPass::CURRENCY_CONTEXT_SERVICE_TAG); + ->addTag(CompositeCurrencyContextPass::CURRENCY_CONTEXT_SERVICE_TAG) + ; } } diff --git a/src/CoreShop/Bundle/CurrencyBundle/Doctrine/ORM/CurrencyRepository.php b/src/CoreShop/Bundle/CurrencyBundle/Doctrine/ORM/CurrencyRepository.php index 56d47ca7fa..06dacd9ecc 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/Doctrine/ORM/CurrencyRepository.php +++ b/src/CoreShop/Bundle/CurrencyBundle/Doctrine/ORM/CurrencyRepository.php @@ -1,17 +1,20 @@ innerJoin('o.countries', 'c') ->andWhere('c.active = true') ->getQuery() - ->getResult(); + ->getResult() + ; } public function getByCode(string $currencyCode): ?CurrencyInterface @@ -41,6 +45,7 @@ public function getByCode(string $currencyCode): ?CurrencyInterface ->andWhere('o.isoCode = :currencyCode') ->setParameter('currencyCode', $currencyCode) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/CurrencyBundle/Doctrine/ORM/ExchangeRateRepository.php b/src/CoreShop/Bundle/CurrencyBundle/Doctrine/ORM/ExchangeRateRepository.php index 2f5bb746f3..f404c79fa8 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/Doctrine/ORM/ExchangeRateRepository.php +++ b/src/CoreShop/Bundle/CurrencyBundle/Doctrine/ORM/ExchangeRateRepository.php @@ -1,17 +1,20 @@ createQueryBuilder('o') ->andWhere($expr->orX( 'o.fromCurrency = :firstCurrency AND o.toCurrency = :secondCurrency', - 'o.toCurrency = :firstCurrency AND o.fromCurrency = :secondCurrency' + 'o.toCurrency = :firstCurrency AND o.fromCurrency = :secondCurrency', )) ->setParameter('firstCurrency', $fromCurrency) ->setParameter('secondCurrency', $toCurrency) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyChoiceType.php b/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyChoiceType.php index 1cbc42e514..7b859137e0 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyChoiceType.php +++ b/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyChoiceType.php @@ -1,17 +1,20 @@ 'id', 'choice_label' => 'name', 'choice_translation_domain' => false, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyType.php b/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyType.php index d5825c0010..201a71ad81 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyType.php +++ b/src/CoreShop/Bundle/CurrencyBundle/Form/Type/CurrencyType.php @@ -1,17 +1,20 @@ add('name', TextType::class) ->add('isoCode', TextType::class) ->add('numericIsoCode', IntegerType::class) - ->add('symbol', TextType::class); + ->add('symbol', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CurrencyBundle/Form/Type/ExchangeRateType.php b/src/CoreShop/Bundle/CurrencyBundle/Form/Type/ExchangeRateType.php index 40e97ad9dc..cdf9bff277 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/Form/Type/ExchangeRateType.php +++ b/src/CoreShop/Bundle/CurrencyBundle/Form/Type/ExchangeRateType.php @@ -1,17 +1,20 @@ add('toCurrency', CurrencyChoiceType::class, [ 'required' => true, 'empty_data' => false, - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/CurrencyBundle/Resources/public/pimcore/css/currency.css b/src/CoreShop/Bundle/CurrencyBundle/Resources/public/pimcore/css/currency.css index e73160d51b..4b17da3dfe 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/Resources/public/pimcore/css/currency.css +++ b/src/CoreShop/Bundle/CurrencyBundle/Resources/public/pimcore/css/currency.css @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ .coreshop_icon_currency, .pimcore_icon_coreShopCurrencyMultiselect, .pimcore_icon_coreShopCurrency, .pimcore_icon_coreShopMoneyCurrency { diff --git a/src/CoreShop/Bundle/CurrencyBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopMoneyCurrency.js b/src/CoreShop/Bundle/CurrencyBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopMoneyCurrency.js index 594e11ba8b..dab50d5098 100755 --- a/src/CoreShop/Bundle/CurrencyBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopMoneyCurrency.js +++ b/src/CoreShop/Bundle/CurrencyBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopMoneyCurrency.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS("pimcore.object.tags.coreShopMoneyCurrency"); diff --git a/src/CoreShop/Bundle/CurrencyBundle/Twig/ConvertCurrencyExtension.php b/src/CoreShop/Bundle/CurrencyBundle/Twig/ConvertCurrencyExtension.php index 0bdc484c61..f48a7fed48 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/Twig/ConvertCurrencyExtension.php +++ b/src/CoreShop/Bundle/CurrencyBundle/Twig/ConvertCurrencyExtension.php @@ -1,17 +1,20 @@ children() ->enumNode('login_identifier')->values(['email', 'username'])->defaultValue('email')->end() - ->end(); + ->end() + ; $this->addStack($rootNode); $this->addModelsSection($rootNode); @@ -57,7 +61,8 @@ private function addStack(ArrayNodeDefinition $node): void ->scalarNode('company')->defaultValue(CompanyInterface::class)->cannotBeEmpty()->end() ->end() ->end() - ->end(); + ->end() + ; } private function addModelsSection(ArrayNodeDefinition $node): void @@ -130,7 +135,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -174,6 +180,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/CustomerBundle/DependencyInjection/CoreShopCustomerExtension.php b/src/CoreShop/Bundle/CustomerBundle/DependencyInjection/CoreShopCustomerExtension.php index 8ba1cef131..d39bf1f24a 100644 --- a/src/CoreShop/Bundle/CustomerBundle/DependencyInjection/CoreShopCustomerExtension.php +++ b/src/CoreShop/Bundle/CustomerBundle/DependencyInjection/CoreShopCustomerExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(CustomerContextInterface::class) - ->addTag(CompositeCustomerContextPass::CUSTOMER_CONTEXT_SERVICE_TAG); + ->addTag(CompositeCustomerContextPass::CUSTOMER_CONTEXT_SERVICE_TAG) + ; $container ->registerForAutoconfiguration(RequestResolverInterface::class) - ->addTag(CompositeRequestResolverPass::CUSTOMER_REQUEST_RESOLVER_SERVICE_TAG); + ->addTag(CompositeRequestResolverPass::CUSTOMER_REQUEST_RESOLVER_SERVICE_TAG) + ; } } diff --git a/src/CoreShop/Bundle/CustomerBundle/Form/Type/ChangePasswordType.php b/src/CoreShop/Bundle/CustomerBundle/Form/Type/ChangePasswordType.php index 5f94e24fa9..8abb61623f 100644 --- a/src/CoreShop/Bundle/CustomerBundle/Form/Type/ChangePasswordType.php +++ b/src/CoreShop/Bundle/CustomerBundle/Form/Type/ChangePasswordType.php @@ -1,17 +1,20 @@ 'coreshop.form.customer.password.must_match', 'first_options' => ['label' => 'coreshop.form.customer.new_password'], 'second_options' => ['label' => 'coreshop.form.customer.new_password_repeat'], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CustomerBundle/Form/Type/CustomerLoginType.php b/src/CoreShop/Bundle/CustomerBundle/Form/Type/CustomerLoginType.php index 203969b279..df5112f7e2 100644 --- a/src/CoreShop/Bundle/CustomerBundle/Form/Type/CustomerLoginType.php +++ b/src/CoreShop/Bundle/CustomerBundle/Form/Type/CustomerLoginType.php @@ -1,17 +1,20 @@ add('_remember_me', CheckboxType::class, [ 'label' => 'coreshop.form.login.remember_me', 'required' => false, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/CustomerBundle/Form/Type/CustomerSelectionType.php b/src/CoreShop/Bundle/CustomerBundle/Form/Type/CustomerSelectionType.php index 1d801442d7..6c14e03980 100644 --- a/src/CoreShop/Bundle/CustomerBundle/Form/Type/CustomerSelectionType.php +++ b/src/CoreShop/Bundle/CustomerBundle/Form/Type/CustomerSelectionType.php @@ -1,17 +1,20 @@ add('lastname', TextType::class, [ 'label' => 'coreshop.form.customer.lastname', - ]); + ]) + ; if ($options['allow_email']) { $builder->add('email', EmailType::class, [ @@ -56,7 +63,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ->add('newsletterActive', CheckboxType::class, [ 'label' => 'coreshop.form.customer.newsletter.subscribe', 'required' => false, - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/CustomerBundle/Pimcore/Repository/CompanyRepository.php b/src/CoreShop/Bundle/CustomerBundle/Pimcore/Repository/CompanyRepository.php index 0eadbbd462..965def9956 100644 --- a/src/CoreShop/Bundle/CustomerBundle/Pimcore/Repository/CompanyRepository.php +++ b/src/CoreShop/Bundle/CustomerBundle/Pimcore/Repository/CompanyRepository.php @@ -1,17 +1,20 @@ addOption('dry-run', null, InputOption::VALUE_NONE, 'Outputs list of fixtures without apply them') ->addOption( 'bundles', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, - 'A list of bundle names to load data from' + 'A list of bundle names to load data from', ) ->addOption( 'exclude', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, - 'A list of bundle names which fixtures should be skipped' - ); + 'A list of bundle names which fixtures should be skipped', + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int @@ -138,8 +144,8 @@ protected function outputFixtures(InputInterface $input, OutputInterface $output $output->writeln( sprintf( 'List of "%s" data fixtures ...', - $this->getTypeOfFixtures($input) - ) + $this->getTypeOfFixtures($input), + ), ); foreach ($fixtures as $fixture) { $output->writeln(sprintf(' > %s', $fixture::class)); @@ -156,21 +162,21 @@ protected function processFixtures(InputInterface $input, OutputInterface $outpu $output->writeln( sprintf( 'Loading "%s" data fixtures ...', - $this->getTypeOfFixtures($input) - ) + $this->getTypeOfFixtures($input), + ), ); $this->fixtureExecutor->setLogger( function (string $message) use ($output) { $output->writeln(sprintf(' > %s', $message)); - } + }, ); $this->fixtureExecutor->execute($fixtures, $this->getTypeOfFixtures($input)); } protected function getTypeOfFixtures(InputInterface $input): string { - return (string)$input->getOption('fixtures-type'); + return (string) $input->getOption('fixtures-type'); } /** diff --git a/src/CoreShop/Bundle/FixtureBundle/CoreShopFixtureBundle.php b/src/CoreShop/Bundle/FixtureBundle/CoreShopFixtureBundle.php index 73042d9797..b43be7a1b7 100644 --- a/src/CoreShop/Bundle/FixtureBundle/CoreShopFixtureBundle.php +++ b/src/CoreShop/Bundle/FixtureBundle/CoreShopFixtureBundle.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/FixtureBundle/DependencyInjection/CoreShopFixtureExtension.php b/src/CoreShop/Bundle/FixtureBundle/DependencyInjection/CoreShopFixtureExtension.php index 883a1e40dc..f8409588f2 100644 --- a/src/CoreShop/Bundle/FixtureBundle/DependencyInjection/CoreShopFixtureExtension.php +++ b/src/CoreShop/Bundle/FixtureBundle/DependencyInjection/CoreShopFixtureExtension.php @@ -1,17 +1,20 @@ createQueryBuilder('t') ->select('t.' . $idField) ->getQuery() - ->getArrayResult(); + ->getArrayResult() + ; $ids = []; foreach ($idsResult as $result) { diff --git a/src/CoreShop/Bundle/FixtureBundle/Fixture/DataFixturesExecutor.php b/src/CoreShop/Bundle/FixtureBundle/Fixture/DataFixturesExecutor.php index ec031d1c60..659888ac8c 100644 --- a/src/CoreShop/Bundle/FixtureBundle/Fixture/DataFixturesExecutor.php +++ b/src/CoreShop/Bundle/FixtureBundle/Fixture/DataFixturesExecutor.php @@ -1,17 +1,20 @@ loadedFixtures[$fixtureObject::class])) { $alreadyLoaded = true; $loadedVersion = $this->loadedFixtures[$fixtureObject::class]; - if ($fixtureObject instanceof VersionedFixtureInterface - && version_compare($loadedVersion, $fixtureObject->getVersion()) == -1 + if ($fixtureObject instanceof VersionedFixtureInterface && + version_compare($loadedVersion, $fixtureObject->getVersion()) == -1 ) { if ($fixtureObject instanceof LoadedFixtureVersionAwareInterface) { $fixtureObject->setLoadedVersion($loadedVersion); diff --git a/src/CoreShop/Bundle/FixtureBundle/Fixture/Sorter/DataFixturesSorter.php b/src/CoreShop/Bundle/FixtureBundle/Fixture/Sorter/DataFixturesSorter.php index cd6dac8f8e..81d205930f 100644 --- a/src/CoreShop/Bundle/FixtureBundle/Fixture/Sorter/DataFixturesSorter.php +++ b/src/CoreShop/Bundle/FixtureBundle/Fixture/Sorter/DataFixturesSorter.php @@ -1,17 +1,20 @@ orderedFixtures, function ($fixture) { return $fixture instanceof OrderedFixtureInterface; - } + }, ); } @@ -141,8 +144,8 @@ function ($fixture) { $count = 0; $unsequencedClasses = []; - while (($count = count($unsequencedClasses = $this->getUnsequencedClasses($sequenceForClasses))) > 0 - && $count !== $lastCount) { + while (($count = count($unsequencedClasses = $this->getUnsequencedClasses($sequenceForClasses))) > 0 && + $count !== $lastCount) { foreach ($unsequencedClasses as $class) { $fixture = $this->fixtures[$class]; $dependencies = $fixture->getDependencies(); @@ -191,14 +194,14 @@ private function validateDependencies($fixtureClass, $dependenciesClasses) 'Method "%s" in class "%s" must return an array of classes which are' . ' dependencies for the fixture, and it must be NOT empty.', 'getDependencies', - $fixtureClass - ) + $fixtureClass, + ), ); } if (in_array($fixtureClass, $dependenciesClasses)) { throw new \InvalidArgumentException( - sprintf('Class "%s" can\'t have itself as a dependency', $fixtureClass) + sprintf('Class "%s" can\'t have itself as a dependency', $fixtureClass), ); } @@ -208,8 +211,8 @@ private function validateDependencies($fixtureClass, $dependenciesClasses) throw new \RuntimeException( sprintf( 'Fixture "%s" was declared as a dependency, but it should be added in fixture loader first.', - $class - ) + $class, + ), ); } } diff --git a/src/CoreShop/Bundle/FixtureBundle/Fixture/UpdateDataFixturesFixture.php b/src/CoreShop/Bundle/FixtureBundle/Fixture/UpdateDataFixturesFixture.php index 4ac0652f55..32af265168 100644 --- a/src/CoreShop/Bundle/FixtureBundle/Fixture/UpdateDataFixturesFixture.php +++ b/src/CoreShop/Bundle/FixtureBundle/Fixture/UpdateDataFixturesFixture.php @@ -1,17 +1,20 @@ where($where) ->setMaxResults(1) ->getQuery() - ->execute($parameters); + ->execute($parameters) + ; return $entityId ? true : false; } @@ -40,7 +44,8 @@ public function updateDataFixtureHistory(array $updateFields, $where, array $par $qb = $this->_em ->createQueryBuilder() ->update($this->getEntityName(), 'm') - ->where($where); + ->where($where) + ; foreach ($updateFields as $fieldName => $fieldValue) { $qb->set($fieldName, $fieldValue); diff --git a/src/CoreShop/Bundle/FixtureBundle/Repository/DataFixtureRepositoryInterface.php b/src/CoreShop/Bundle/FixtureBundle/Repository/DataFixtureRepositoryInterface.php index 688aee0e65..bed4beaab9 100644 --- a/src/CoreShop/Bundle/FixtureBundle/Repository/DataFixtureRepositoryInterface.php +++ b/src/CoreShop/Bundle/FixtureBundle/Repository/DataFixtureRepositoryInterface.php @@ -1,17 +1,20 @@ getData(); $code = $form->get('cartRuleCoupon')->getData(); - if(method_exists($form, 'getClickedButton')) { + if (method_exists($form, 'getClickedButton')) { $submit = $form->getClickedButton(); $validateVoucherCode = $submit && 'submit_voucher' === $submit->getName(); } else { - $validateVoucherCode = (bool)$code; + $validateVoucherCode = (bool) $code; } if ($validateVoucherCode) { @@ -92,7 +95,7 @@ public function summaryAction(Request $request): Response if (!$voucherCode instanceof CartPriceRuleVoucherCodeInterface) { $this->addFlash( 'error', - $this->get('translator')->trans('coreshop.ui.error.voucher.not_found') + $this->get('translator')->trans('coreshop.ui.error.voucher.not_found'), ); return $this->redirectToRoute('coreshop_cart_summary'); @@ -104,7 +107,7 @@ public function summaryAction(Request $request): Response $this->getCartManager()->persistCart($cart); $this->addFlash( 'success', - $this->get('translator')->trans('coreshop.ui.success.voucher.stored') + $this->get('translator')->trans('coreshop.ui.success.voucher.stored'), ); } else { $this->addFlash('error', $this->get('translator')->trans('coreshop.ui.error.voucher.invalid')); @@ -228,7 +231,7 @@ public function addItemAction(Request $request): Response $this->get(TrackerInterface::class)->trackCartAdd( $addToCart->getCart(), $addToCart->getCartItem()->getProduct(), - $addToCart->getCartItem()->getQuantity() + $addToCart->getCartItem()->getQuantity(), ); $this->addFlash('success', $this->get('translator')->trans('coreshop.ui.item_added')); @@ -269,7 +272,7 @@ public function addItemAction(Request $request): Response [ 'form' => $form->createView(), 'product' => $product, - ] + ], ); } @@ -369,6 +372,7 @@ private function getCartItemErrors(OrderItemInterface $cartItem): ConstraintViol { return $this ->get('validator') - ->validate($cartItem, null, $this->container->getParameter('coreshop.form.type.cart_item.validation_groups')); + ->validate($cartItem, null, $this->container->getParameter('coreshop.form.type.cart_item.validation_groups')) + ; } } diff --git a/src/CoreShop/Bundle/FrontendBundle/Controller/CategoryController.php b/src/CoreShop/Bundle/FrontendBundle/Controller/CategoryController.php index 17b4b3000d..f835f9aaca 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Controller/CategoryController.php +++ b/src/CoreShop/Bundle/FrontendBundle/Controller/CategoryController.php @@ -1,17 +1,20 @@ validSortProperties = $validSortProperties; $this->defaultSortName = $defaultSortName; @@ -94,7 +97,7 @@ public function indexAction(Request $request): Response $category = $this->getRepository()->findOneBy([ $this->repositoryIdentifier => $id, - 'pimcore_unpublished' => true + 'pimcore_unpublished' => true, ]); if (!$category instanceof CategoryInterface) { @@ -102,8 +105,8 @@ public function indexAction(Request $request): Response sprintf( 'category with identifier "%s" (%s) not found', $this->repositoryIdentifier, - $this->getParameterFromRequest($request, $this->requestIdentifier) - ) + $this->getParameterFromRequest($request, $this->requestIdentifier), + ), ); } @@ -122,13 +125,13 @@ public function detail(Request $request, CategoryInterface $category): Response $displaySubCategories = $this->getConfigurationService()->getForStore('system.category.list.include_subcategories'); $variantMode = $this->getConfigurationService()->getForStore('system.category.variant_mode'); - $page = (int)$this->getParameterFromRequest($request, 'page', 1) ?: 1; + $page = (int) $this->getParameterFromRequest($request, 'page', 1) ?: 1; $type = $this->getParameterFromRequest($request, 'type', $listModeDefault); $defaultPerPage = $type === 'list' ? $listPerPageDefault : $gridPerPageDefault; $allowedPerPage = $type === 'list' ? $listPerPageAllowed : $gridPerPageAllowed; - $perPage = (int)$this->getParameterFromRequest($request, 'perPage', $defaultPerPage) ?: 10; + $perPage = (int) $this->getParameterFromRequest($request, 'perPage', $defaultPerPage) ?: 10; $this->validateCategory($request, $category); @@ -139,7 +142,7 @@ public function detail(Request $request, CategoryInterface $category): Response $filteredList->setLocale($request->getLocale()); $filteredList->setVariantMode($variantMode ? $variantMode : ListingInterface::VARIANT_MODE_HIDE); $filteredList->addCondition(new LikeCondition('stores', 'both', sprintf('%1$s%2$s%1$s', ',', $this->getContext()->getStore()->getId())), 'stores'); - $filteredList->addCondition(new LikeCondition('parentCategoryIds', 'both', (string)$category->getId()), 'parentCategoryIds'); + $filteredList->addCondition(new LikeCondition('parentCategoryIds', 'both', (string) $category->getId()), 'parentCategoryIds'); $orderDirection = $category->getFilter()->getOrderDirection(); $orderKey = $category->getFilter()->getOrderKey(); @@ -157,7 +160,7 @@ public function detail(Request $request, CategoryInterface $category): Response $paginator = $this->getPaginator()->paginate( $filteredList, $page, - $perPage + $perPage, ); $viewParameters['list'] = $filteredList; @@ -194,7 +197,7 @@ public function detail(Request $request, CategoryInterface $category): Response $paginator = $this->getPaginator()->paginate( $list, $page, - $perPage + $perPage, ); $viewParameters['paginator'] = $paginator; diff --git a/src/CoreShop/Bundle/FrontendBundle/Controller/CheckoutController.php b/src/CoreShop/Bundle/FrontendBundle/Controller/CheckoutController.php index 9f6141f02c..382f2f2358 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Controller/CheckoutController.php +++ b/src/CoreShop/Bundle/FrontendBundle/Controller/CheckoutController.php @@ -1,17 +1,20 @@ denyAccessUnlessGranted('CORESHOP_CUSTOMER_PROFILE_ADDRESS_EDIT'); - } - else { + } else { $this->denyAccessUnlessGranted('CORESHOP_CUSTOMER_PROFILE_ADDRESS_ADD'); } @@ -180,7 +182,7 @@ public function addressAction(Request $request): Response $this->addFlash('success', $this->get('translator')->trans(sprintf('coreshop.ui.customer.address_successfully_%s', $eventType === 'add' ? 'added' : 'updated'))); return $this->redirect( - $this->getParameterFromRequest($request, '_redirect', $this->generateUrl('coreshop_customer_addresses')) + $this->getParameterFromRequest($request, '_redirect', $this->generateUrl('coreshop_customer_addresses')), ); } } @@ -204,7 +206,7 @@ public function addressDeleteAction(Request $request): Response } $address = $this->get('coreshop.repository.address')->find( - $this->getParameterFromRequest($request, 'address') + $this->getParameterFromRequest($request, 'address'), ); if (!$address instanceof AddressInterface) { diff --git a/src/CoreShop/Bundle/FrontendBundle/Controller/FrontendController.php b/src/CoreShop/Bundle/FrontendBundle/Controller/FrontendController.php index d70b69861c..2c7a1d47be 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Controller/FrontendController.php +++ b/src/CoreShop/Bundle/FrontendBundle/Controller/FrontendController.php @@ -1,17 +1,20 @@ getParameterFromRequest($request,'token'); + $token = $this->getParameterFromRequest($request, 'token'); $payment = null; /** @var OrderInterface $order */ diff --git a/src/CoreShop/Bundle/FrontendBundle/Controller/ProductController.php b/src/CoreShop/Bundle/FrontendBundle/Controller/ProductController.php index 7d4a8ecb41..03cba86e4e 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Controller/ProductController.php +++ b/src/CoreShop/Bundle/FrontendBundle/Controller/ProductController.php @@ -1,17 +1,20 @@ getPaginator()->paginate( $list, $page, - $itemsPerPage + $itemsPerPage, ); return $this->render($this->templateConfigurator->findTemplate('Search/search.html'), [ diff --git a/src/CoreShop/Bundle/FrontendBundle/Controller/SecurityController.php b/src/CoreShop/Bundle/FrontendBundle/Controller/SecurityController.php index fb5baee8e5..fde0ec8365 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Controller/SecurityController.php +++ b/src/CoreShop/Bundle/FrontendBundle/Controller/SecurityController.php @@ -1,17 +1,20 @@ $value) { $controllerKey = sprintf('coreshop.frontend.controller.%s', $key); $serviceName = sprintf('CoreShop\\Bundle\\FrontendBundle\\Controller\\%sController', ucfirst($key)); - $controllerClass = (string)$container->getParameter($controllerKey); + $controllerClass = (string) $container->getParameter($controllerKey); if ($container->hasDefinition($controllerClass)) { $customController = $container->getDefinition($controllerClass); @@ -96,7 +99,7 @@ public function process(ContainerBuilder $container): void } $controllerDefinition->addTag('controller.service_arguments'); - + $container->setDefinition($serviceName, $controllerDefinition)->setPublic(true); $container->setAlias($controllerKey, $serviceName)->setPublic(true); diff --git a/src/CoreShop/Bundle/FrontendBundle/DependencyInjection/Configuration.php b/src/CoreShop/Bundle/FrontendBundle/DependencyInjection/Configuration.php index 5f88799f80..0be8b71a54 100644 --- a/src/CoreShop/Bundle/FrontendBundle/DependencyInjection/Configuration.php +++ b/src/CoreShop/Bundle/FrontendBundle/DependencyInjection/Configuration.php @@ -1,17 +1,20 @@ children() ->scalarNode('view_suffix')->defaultValue('twig')->end() ->scalarNode('view_bundle')->defaultValue('CoreShopFrontend')->end() - ->end(); + ->end() + ; $this->addCategorySection($rootNode); $this->addPimcoreResourcesSection($rootNode); @@ -72,7 +76,8 @@ private function addCategorySection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addControllerSection(ArrayNodeDefinition $node): void @@ -96,7 +101,8 @@ private function addControllerSection(ArrayNodeDefinition $node): void ->scalarNode('payment')->defaultValue(PaymentController::class)->end() ->scalarNode('mail')->defaultValue(MailController::class)->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -127,6 +133,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/FrontendBundle/DependencyInjection/CoreShopFrontendExtension.php b/src/CoreShop/Bundle/FrontendBundle/DependencyInjection/CoreShopFrontendExtension.php index 5377bc63ae..786fa16506 100644 --- a/src/CoreShop/Bundle/FrontendBundle/DependencyInjection/CoreShopFrontendExtension.php +++ b/src/CoreShop/Bundle/FrontendBundle/DependencyInjection/CoreShopFrontendExtension.php @@ -1,17 +1,20 @@ add('text', \Symfony\Component\Form\Extension\Core\Type\SearchType::class, [ 'label' => 'coreshop.form.search.text', - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/public/static/css/mail.css b/src/CoreShop/Bundle/FrontendBundle/Resources/public/static/css/mail.css index 191ab04661..11d86f1b3d 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Resources/public/static/css/mail.css +++ b/src/CoreShop/Bundle/FrontendBundle/Resources/public/static/css/mail.css @@ -1,13 +1,17 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ + .body-drip { border-top: 8px solid #cd1017; } diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/public/static/css/shop.css b/src/CoreShop/Bundle/FrontendBundle/Resources/public/static/css/shop.css index aaf91c1a78..1c4c23e94d 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Resources/public/static/css/shop.css +++ b/src/CoreShop/Bundle/FrontendBundle/Resources/public/static/css/shop.css @@ -1,13 +1,16 @@ @charset "UTF-8"; -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ /*! diff --git a/src/CoreShop/Bundle/FrontendBundle/TemplateConfigurator/TemplateConfigurator.php b/src/CoreShop/Bundle/FrontendBundle/TemplateConfigurator/TemplateConfigurator.php index efd386b21f..448be277a7 100644 --- a/src/CoreShop/Bundle/FrontendBundle/TemplateConfigurator/TemplateConfigurator.php +++ b/src/CoreShop/Bundle/FrontendBundle/TemplateConfigurator/TemplateConfigurator.php @@ -1,23 +1,28 @@ environment, 'test')) { - return ['attr' => ['data-test-' . $name => (string)$value]]; + return ['attr' => ['data-test-' . $name => (string) $value]]; } return []; }, - ['is_safe' => ['html']] + ['is_safe' => ['html']], ), ]; } diff --git a/src/CoreShop/Bundle/FrontendBundle/Twig/TestHtmlAttributeExtension.php b/src/CoreShop/Bundle/FrontendBundle/Twig/TestHtmlAttributeExtension.php index c9244f3aa4..db28edc7f9 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Twig/TestHtmlAttributeExtension.php +++ b/src/CoreShop/Bundle/FrontendBundle/Twig/TestHtmlAttributeExtension.php @@ -1,17 +1,20 @@ env, 'test')) { - return sprintf('data-test-%s="%s"', $name, (string)$value); + return sprintf('data-test-%s="%s"', $name, (string) $value); } return ''; }, - ['is_safe' => ['html']] + ['is_safe' => ['html']], ), ]; } diff --git a/src/CoreShop/Bundle/IndexBundle/Command/IndexCommand.php b/src/CoreShop/Bundle/IndexBundle/Command/IndexCommand.php index 99ec7a61bc..46b80ed1ad 100644 --- a/src/CoreShop/Bundle/IndexBundle/Command/IndexCommand.php +++ b/src/CoreShop/Bundle/IndexBundle/Command/IndexCommand.php @@ -1,17 +1,20 @@ dispatchInfo('status', 'No Indices available, you have to first create an Index.'); } else { $output->writeln( - sprintf('No Indices found for %s', implode(', ', $indexIds)) + sprintf('No Indices found for %s', implode(', ', $indexIds)), ); $this->dispatchInfo( 'status', - sprintf('No Indices found for %s', implode(', ', $indexIds)) + sprintf('No Indices found for %s', implode(', ', $indexIds)), ); } @@ -115,6 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $list = '\Pimcore\Model\DataObject\\' . $class . '\Listing'; /** * @var Listing $list + * * @psalm-suppress UndefinedClass */ $list = new $list(); @@ -149,7 +154,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $output->writeln(sprintf('Processing %s Objects of class "%s"', $total, $class)); $progress = new ProgressBar($output, $total); $progress->setFormat( - '%current%/%max% [%bar%] %percent:3s%% (%elapsed:6s%/%estimated:-6s%) %memory:6s%: %message%' + '%current%/%max% [%bar%] %percent:3s%% (%elapsed:6s%/%estimated:-6s%) %memory:6s%: %message%', ); $progress->start(); diff --git a/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/AbstractMysqlDynamicRenderer.php b/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/AbstractMysqlDynamicRenderer.php index 0d08ec42a0..4bb1d7d52e 100644 --- a/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/AbstractMysqlDynamicRenderer.php +++ b/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/AbstractMysqlDynamicRenderer.php @@ -1,17 +1,20 @@ getValues() as $value) { - $inValues[] = $this->quote((string)$value); + $inValues[] = $this->quote((string) $value); } if (count($inValues) > 0) { @@ -47,7 +50,7 @@ public function render(WorkerInterface $worker, ConditionInterface $condition, s '%s %s (%s)', $this->quoteFieldName($condition->getFieldName(), $prefix), $operator, - implode(',', $inValues) + implode(',', $inValues), ); } diff --git a/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/IsNullRenderer.php b/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/IsNullRenderer.php index 6a3296b8b1..84dbc9bcb8 100644 --- a/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/IsNullRenderer.php +++ b/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/IsNullRenderer.php @@ -1,17 +1,20 @@ quoteFieldName($condition->getFieldName(), $prefix), $operator, - $this->quote($patternValue) + $this->quote($patternValue), ); } diff --git a/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/RangeRenderer.php b/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/RangeRenderer.php index 2ee3a076ad..fc1135c293 100644 --- a/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/RangeRenderer.php +++ b/src/CoreShop/Bundle/IndexBundle/Condition/Mysql/RangeRenderer.php @@ -1,17 +1,20 @@ true, 'pre_conditions' => array_keys($this->getPreConditionTypes()), 'user_conditions' => array_keys($this->getUserConditionTypes()), - ] + ], ); } diff --git a/src/CoreShop/Bundle/IndexBundle/Controller/IndexController.php b/src/CoreShop/Bundle/IndexBundle/Controller/IndexController.php index de0da41368..aad8c0c2b8 100644 --- a/src/CoreShop/Bundle/IndexBundle/Controller/IndexController.php +++ b/src/CoreShop/Bundle/IndexBundle/Controller/IndexController.php @@ -1,17 +1,20 @@ $gettersResult, 'fieldTypes' => $fieldTypesResult, 'classes' => $availableClasses, - ] + ], ); } @@ -332,7 +335,7 @@ protected function getClassificationStoreFields(DataObject\ClassDefinition\Data\ } protected function getClassificationStoreGroupConfiguration( - DataObject\Classificationstore\GroupConfig $config + DataObject\Classificationstore\GroupConfig $config, ): array { $result = []; $result['nodeLabel'] = $config->getName(); @@ -372,7 +375,7 @@ protected function getFieldConfiguration(DataObject\ClassDefinition\Data $field) protected function getClassificationStoreFieldConfiguration( DataObject\Classificationstore\KeyConfig $field, - DataObject\Classificationstore\GroupConfig $groupConfig + DataObject\Classificationstore\GroupConfig $groupConfig, ): array { $definition = [ 'name' => $field->getName(), diff --git a/src/CoreShop/Bundle/IndexBundle/CoreExtension/Filter.php b/src/CoreShop/Bundle/IndexBundle/CoreExtension/Filter.php index 8e485baf7b..4388561fd9 100644 --- a/src/CoreShop/Bundle/IndexBundle/CoreExtension/Filter.php +++ b/src/CoreShop/Bundle/IndexBundle/CoreExtension/Filter.php @@ -1,17 +1,20 @@ addTag('coreshop.filter.user_condition_type', $tag); $definition->addTag('coreshop.filter.pre_condition_type', $tag); } diff --git a/src/CoreShop/Bundle/IndexBundle/DependencyInjection/Compiler/RegisterFilterPreConditionTypesPass.php b/src/CoreShop/Bundle/IndexBundle/DependencyInjection/Compiler/RegisterFilterPreConditionTypesPass.php index 2c559aec50..31bc310b76 100644 --- a/src/CoreShop/Bundle/IndexBundle/DependencyInjection/Compiler/RegisterFilterPreConditionTypesPass.php +++ b/src/CoreShop/Bundle/IndexBundle/DependencyInjection/Compiler/RegisterFilterPreConditionTypesPass.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -156,7 +160,8 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } public function addIndexColumnsTypeSection(ArrayNodeDefinition $node): void @@ -167,6 +172,7 @@ public function addIndexColumnsTypeSection(ArrayNodeDefinition $node): void ->useAttributeAsKey('name') ->prototype('scalar')->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/IndexBundle/DependencyInjection/CoreShopIndexExtension.php b/src/CoreShop/Bundle/IndexBundle/DependencyInjection/CoreShopIndexExtension.php index abfff2aac1..a5c0028139 100644 --- a/src/CoreShop/Bundle/IndexBundle/DependencyInjection/CoreShopIndexExtension.php +++ b/src/CoreShop/Bundle/IndexBundle/DependencyInjection/CoreShopIndexExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(DynamicRendererInterface::class) - ->addTag(RegisterConditionRendererTypesPass::INDEX_CONDITION_RENDERER_TAG); + ->addTag(RegisterConditionRendererTypesPass::INDEX_CONDITION_RENDERER_TAG) + ; $container ->registerForAutoconfiguration(DynamicOrderRendererInterface::class) - ->addTag(RegisterOrderRendererTypesPass::INDEX_ORDER_RENDERER_TAG); + ->addTag(RegisterOrderRendererTypesPass::INDEX_ORDER_RENDERER_TAG) + ; $container ->registerForAutoconfiguration(IndexExtensionInterface::class) - ->addTag(RegisterExtensionsPass::INDEX_EXTENSION_TAG); + ->addTag(RegisterExtensionsPass::INDEX_EXTENSION_TAG) + ; $container ->registerForAutoconfiguration(FilterConditionProcessorInterface::class) - ->addTag(RegisterFilterConditionTypesPass::INDEX_FILTER_CONDITION_TAG); + ->addTag(RegisterFilterConditionTypesPass::INDEX_FILTER_CONDITION_TAG) + ; $container ->registerForAutoconfiguration(FilterPreConditionProcessorInterface::class) - ->addTag(RegisterFilterPreConditionTypesPass::INDEX_FILTER_PRE_CONDITION_TAG); + ->addTag(RegisterFilterPreConditionTypesPass::INDEX_FILTER_PRE_CONDITION_TAG) + ; $container ->registerForAutoconfiguration(FilterUserConditionProcessorInterface::class) - ->addTag(RegisterFilterUserConditionTypesPass::INDEX_FILTER_USER_CONDITION_TAG); + ->addTag(RegisterFilterUserConditionTypesPass::INDEX_FILTER_USER_CONDITION_TAG) + ; $container ->registerForAutoconfiguration(GetterInterface::class) - ->addTag(RegisterGetterPass::INDEX_GETTER_TAG); + ->addTag(RegisterGetterPass::INDEX_GETTER_TAG) + ; $container ->registerForAutoconfiguration(WorkerInterface::class) - ->addTag(RegisterIndexWorkerPass::INDEX_WORKER_TAG); + ->addTag(RegisterIndexWorkerPass::INDEX_WORKER_TAG) + ; $container ->registerForAutoconfiguration(InterpreterInterface::class) - ->addTag(RegisterInterpreterPass::INDEX_INTERPRETER_TAG); + ->addTag(RegisterInterpreterPass::INDEX_INTERPRETER_TAG) + ; } } diff --git a/src/CoreShop/Bundle/IndexBundle/EventListener/AdminJavascriptListener.php b/src/CoreShop/Bundle/IndexBundle/EventListener/AdminJavascriptListener.php index d54e0b8e7d..494aed1866 100644 --- a/src/CoreShop/Bundle/IndexBundle/EventListener/AdminJavascriptListener.php +++ b/src/CoreShop/Bundle/IndexBundle/EventListener/AdminJavascriptListener.php @@ -1,17 +1,20 @@ addConfigurationFields($event->getForm(), $this->formTypeRegistry->get($data['objectType'], 'default')); - }); + }) + ; } public function configureOptions(OptionsResolver $resolver): void @@ -75,7 +82,8 @@ public function configureOptions(OptionsResolver $resolver): void $resolver ->setDefault('configuration_type', null) - ->setAllowedTypes('configuration_type', ['string', 'null']); + ->setAllowedTypes('configuration_type', ['string', 'null']) + ; } protected function addConfigurationFields(FormInterface $form, string $configurationType): void diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeClassificationStoreType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeClassificationStoreType.php index 3bdfbf5ac6..74188ab983 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeClassificationStoreType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeClassificationStoreType.php @@ -1,17 +1,20 @@ ['coreshop']]), new Type(['type' => 'numeric', 'groups' => ['coreshop']]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeFieldCollectionType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeFieldCollectionType.php index 0388cee15d..3ddaa031a1 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeFieldCollectionType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeFieldCollectionType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => ['coreshop']]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeLocalizedFieldsType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeLocalizedFieldsType.php index cf432bc574..5207a9f45a 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeLocalizedFieldsType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeLocalizedFieldsType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => ['coreshop']]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeObjectType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeObjectType.php index 633d4a45bf..e43eedd288 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeObjectType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Column/IndexColumnTypeObjectType.php @@ -1,17 +1,20 @@ $type] - ) + ['configuration_type' => $type], + ), ); $prototypes[$type] = $formBuilder->getForm(); diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/EmptyConfigurationFormType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/EmptyConfigurationFormType.php index 5de50c7a58..d70793072f 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/EmptyConfigurationFormType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/EmptyConfigurationFormType.php @@ -1,17 +1,20 @@ add('field', TextType::class) - ->add('preSelect', TextType::class); + ->add('preSelect', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionCategoryMultiSelectType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionCategoryMultiSelectType.php index 5515ef11d3..0c5207ca84 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionCategoryMultiSelectType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionCategoryMultiSelectType.php @@ -1,17 +1,20 @@ TextType::class, ]) ->add('includeSubCategories', CheckboxType::class) - ->add('concatenator', TextType::class); + ->add('concatenator', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionCategorySelectType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionCategorySelectType.php index 784d365f13..bca88eb67c 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionCategorySelectType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionCategorySelectType.php @@ -1,17 +1,20 @@ add('field', TextType::class) ->add('preSelect', TextType::class) - ->add('includeSubCategories', CheckboxType::class); + ->add('includeSubCategories', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionMultiselectType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionMultiselectType.php index 882cff6345..c4fa5d7d9a 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionMultiselectType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionMultiselectType.php @@ -1,17 +1,20 @@ true, 'allow_delete' => true, 'entry_type' => TextType::class, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionRangeType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionRangeType.php index 89ee71972c..3f8aff6b33 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionRangeType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionRangeType.php @@ -1,17 +1,20 @@ [ new Type(['type' => 'numeric', 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionSearchType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionSearchType.php index e39e13b518..01c31ed9fd 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionSearchType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionSearchType.php @@ -1,12 +1,27 @@ add('searchTerm', TextType::class) ->add('concatenator', TextType::class) - ->add('pattern', TextType::class); + ->add('pattern', TextType::class) + ; } public function getBlockPrefix(): string @@ -36,4 +52,3 @@ public function getBlockPrefix(): string return 'coreshop_filter_condition_type_search'; } } - diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionSelectType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionSelectType.php index c1c42febde..50f6fd1818 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionSelectType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterConditionSelectType.php @@ -1,17 +1,20 @@ add('field', TextType::class) - ->add('preSelect', TextType::class); + ->add('preSelect', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterPreConditionNestedType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterPreConditionNestedType.php index 52b6e2c25a..8e7780a316 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterPreConditionNestedType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterPreConditionNestedType.php @@ -1,17 +1,20 @@ add('conditions', FilterPreConditionCollectionType::class, [ 'constraints' => [new Valid(['groups' => $this->validationGroups])], 'nested' => true, - ]); + ]) + ; $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { $data = $event->getData(); diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterUserConditionNestedType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterUserConditionNestedType.php index b33e5ecd3f..6899954fa1 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterUserConditionNestedType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Filter/FilterUserConditionNestedType.php @@ -1,17 +1,20 @@ add('conditions', FilterUserConditionCollectionType::class, [ 'constraints' => [new Valid(['groups' => $this->validationGroups])], 'nested' => true, - ]); + ]) + ; $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { $data = $event->getData(); diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterConditionChoiceType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterConditionChoiceType.php index 43227fdca8..504d99e2e8 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterConditionChoiceType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterConditionChoiceType.php @@ -1,17 +1,20 @@ add('type', FilterConditionChoiceType::class) ->add('label', TextType::class) ->add('sort', IntegerType::class) - ->add('quantityUnit', TextType::class); + ->add('quantityUnit', TextType::class) + ; $builder ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { @@ -76,7 +82,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void } $this->addConfigurationFields($event->getForm(), $this->formTypeRegistry->get($data['type'], 'default')); - }); + }) + ; } public function configureOptions(OptionsResolver $resolver): void @@ -85,7 +92,8 @@ public function configureOptions(OptionsResolver $resolver): void $resolver ->setDefault('configuration_type', null) - ->setAllowedTypes('configuration_type', ['string', 'null']); + ->setAllowedTypes('configuration_type', ['string', 'null']) + ; } protected function addConfigurationFields(FormInterface $form, string $configurationType): void diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterPreConditionChoiceType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterPreConditionChoiceType.php index fb768e2a21..1cb0caf53c 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterPreConditionChoiceType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterPreConditionChoiceType.php @@ -1,17 +1,20 @@ add('type', FilterPreConditionChoiceType::class); + ->add('type', FilterPreConditionChoiceType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterType.php index 4a62962b18..557181bc52 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterType.php @@ -1,17 +1,20 @@ true, 'constraints' => [ - new NotBlank(['groups' => $this->validationGroups]) - ] + new NotBlank(['groups' => $this->validationGroups]), + ], ]) ->add('preConditions', FilterPreConditionCollectionType::class) ->add('conditions', FilterUserConditionCollectionType::class) ->add('resultsPerPage', IntegerType::class) - ->add('index', IndexChoiceType::class); + ->add('index', IndexChoiceType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterUserConditionChoiceType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterUserConditionChoiceType.php index f9e08541e7..f32773ae47 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterUserConditionChoiceType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/FilterUserConditionChoiceType.php @@ -1,17 +1,20 @@ add('type', FilterPreConditionChoiceType::class); + ->add('type', FilterPreConditionChoiceType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/BrickGetterFormType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/BrickGetterFormType.php index e2856e61fa..3490635c25 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/BrickGetterFormType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/BrickGetterFormType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/ClassificationStoreGetterFormType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/ClassificationStoreGetterFormType.php index 942fe4baee..7a4279cb7c 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/ClassificationStoreGetterFormType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/ClassificationStoreGetterFormType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/FieldCollectionGetterFormType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/FieldCollectionGetterFormType.php index 203dbca920..06975197ff 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/FieldCollectionGetterFormType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Getter/FieldCollectionGetterFormType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexChoiceType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexChoiceType.php index 0a1577ba98..27826b5db6 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexChoiceType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexChoiceType.php @@ -1,17 +1,20 @@ 'id', 'choice_label' => 'name', 'choice_translation_domain' => false, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexColumnChoiceType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexColumnChoiceType.php index 8c46c51661..63aa4d56e6 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexColumnChoiceType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexColumnChoiceType.php @@ -1,17 +1,20 @@ add('getter', IndexColumnGetterChoiceType::class) - ->add('interpreter', IndexColumnInterpreterChoiceType::class); + ->add('interpreter', IndexColumnInterpreterChoiceType::class) + ; /* * Getter Configurations @@ -74,7 +83,8 @@ public function buildForm(FormBuilderInterface $builder, array $options = []): v } $this->addGetterConfigurationFields($event->getForm(), $this->getterTypeRegistry->get($data['getter'], 'default')); - }); + }) + ; /* * Interpreter Configurations @@ -104,7 +114,8 @@ public function buildForm(FormBuilderInterface $builder, array $options = []): v } $this->addInterpreterConfigurationFields($event->getForm(), $this->interpreterTypeRegistry->get($data['interpreter'], 'default')); - }); + }) + ; } /** diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexType.php index f93809de2c..ef6c0554ac 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexType.php @@ -1,17 +1,20 @@ add('worker', IndexWorkerChoiceType::class) ->add('class', PimcoreClassChoiceType::class) ->add('columns', IndexColumnCollectionType::class) - ->add('indexLastVersion', CheckboxType::class); + ->add('indexLastVersion', CheckboxType::class) + ; $builder ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { @@ -74,7 +81,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void } $this->addConfigurationFields($event->getForm(), $this->formTypeRegistry->get($data['worker'], 'default')); - }); + }) + ; } /** diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexWorkerChoiceType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexWorkerChoiceType.php index c2f9c95b0f..86c8354c5d 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexWorkerChoiceType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/IndexWorkerChoiceType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/InterpreterCollectionType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/InterpreterCollectionType.php index d5b327bfba..d536c138a4 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/InterpreterCollectionType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/InterpreterCollectionType.php @@ -1,17 +1,20 @@ $type] - ) + ['configuration_type' => $type], + ), ); $prototypes[$type] = $formBuilder->getForm(); diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/InterpreterType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/InterpreterType.php index 52fd8fe5a0..e7612db25f 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/InterpreterType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/InterpreterType.php @@ -1,17 +1,20 @@ add('type', IndexColumnInterpreterChoiceType::class); + ->add('type', IndexColumnInterpreterChoiceType::class) + ; $builder ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { @@ -70,7 +74,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void } $this->addConfigurationFields($event->getForm(), $this->formTypeRegistry->get($data['type'], 'default')); - }); + }) + ; } public function configureOptions(OptionsResolver $resolver): void @@ -79,7 +84,8 @@ public function configureOptions(OptionsResolver $resolver): void $resolver ->setDefault('configuration_type', null) - ->setAllowedTypes('configuration_type', ['string', 'null']); + ->setAllowedTypes('configuration_type', ['string', 'null']) + ; } /** diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/IteratorInterpreterType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/IteratorInterpreterType.php index b1973a3bad..e597ac0c32 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/IteratorInterpreterType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/IteratorInterpreterType.php @@ -1,17 +1,20 @@ [ new Valid(['groups' => $this->validationGroups]), ], - ]); + ]) + ; } } diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/NestedInterpreterType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/NestedInterpreterType.php index 1e1ad38ab9..82e80dee68 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/NestedInterpreterType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/NestedInterpreterType.php @@ -1,17 +1,20 @@ [ new Valid(['groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/ObjectPropertyInterpreterFormType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/ObjectPropertyInterpreterFormType.php index be8e39fa3c..d473242d13 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/ObjectPropertyInterpreterFormType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Interpreter/ObjectPropertyInterpreterFormType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Worker/MysqlWorkerTableIndexType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Worker/MysqlWorkerTableIndexType.php index cace59b9af..d1aac13c89 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Worker/MysqlWorkerTableIndexType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Worker/MysqlWorkerTableIndexType.php @@ -1,17 +1,20 @@ add('columns', CollectionType::class, [ 'allow_delete' => true, 'allow_add' => true, - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/IndexBundle/Form/Type/Worker/MysqlWorkerType.php b/src/CoreShop/Bundle/IndexBundle/Form/Type/Worker/MysqlWorkerType.php index b29db6b5c5..9cfbe5c9d1 100644 --- a/src/CoreShop/Bundle/IndexBundle/Form/Type/Worker/MysqlWorkerType.php +++ b/src/CoreShop/Bundle/IndexBundle/Form/Type/Worker/MysqlWorkerType.php @@ -1,17 +1,20 @@ true, 'allow_delete' => true, 'by_reference' => false, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/IndexBundle/Installer.php b/src/CoreShop/Bundle/IndexBundle/Installer.php index 874708c574..3b13c47401 100644 --- a/src/CoreShop/Bundle/IndexBundle/Installer.php +++ b/src/CoreShop/Bundle/IndexBundle/Installer.php @@ -1,17 +1,20 @@ 'coreshop:resources:install']; $options = array_merge( $options, - ['--no-interaction' => true, '--application-name object_index'] + ['--no-interaction' => true, '--application-name object_index'], ); $application->run(new ArrayInput($options)); $options = ['command' => 'coreshop:resources:create-tables']; $options = array_merge( $options, - ['application-name' => 'coreshop', '--no-interaction' => true, '--force' => true] + ['application-name' => 'coreshop', '--no-interaction' => true, '--force' => true], ); $application->run(new ArrayInput($options)); diff --git a/src/CoreShop/Bundle/IndexBundle/Menu/IndexMenuBuilder.php b/src/CoreShop/Bundle/IndexBundle/Menu/IndexMenuBuilder.php index a9fb4378af..4d87028d6c 100644 --- a/src/CoreShop/Bundle/IndexBundle/Menu/IndexMenuBuilder.php +++ b/src/CoreShop/Bundle/IndexBundle/Menu/IndexMenuBuilder.php @@ -1,17 +1,20 @@ setAttribute('permission', 'coreshop_permission_index') ->setAttribute('iconCls', 'coreshop_nav_icon_indexes') ->setAttribute('resource', 'coreshop.index') - ->setAttribute('function', 'index'); + ->setAttribute('function', 'index') + ; $menuItem ->addChild('coreshop_filters') @@ -49,6 +53,7 @@ public function buildMenu(ItemInterface $menuItem, FactoryInterface $factory, st ->setAttribute('permission', 'coreshop_permission_filter') ->setAttribute('iconCls', 'coreshop_nav_icon_filters') ->setAttribute('resource', 'coreshop.index') - ->setAttribute('function', 'filter'); + ->setAttribute('function', 'filter') + ; } } diff --git a/src/CoreShop/Bundle/IndexBundle/Migrations/Version20200224161101.php b/src/CoreShop/Bundle/IndexBundle/Migrations/Version20200224161101.php index 122c1a0468..bbc7a1c456 100644 --- a/src/CoreShop/Bundle/IndexBundle/Migrations/Version20200224161101.php +++ b/src/CoreShop/Bundle/IndexBundle/Migrations/Version20200224161101.php @@ -1,17 +1,20 @@ process = $this->processFactory->createProcess( sprintf( 'CoreShop Index: %s', - $date->formatLocalized('%A %d %B %Y') + $date->formatLocalized('%A %d %B %Y'), ), 'coreshop_index', 'Indexing', -1, - 0 + 0, ); $this->process->save(); diff --git a/src/CoreShop/Bundle/IndexBundle/ProcessManager/IndexProcess.php b/src/CoreShop/Bundle/IndexBundle/ProcessManager/IndexProcess.php index be4d49c2b2..b74a6988a3 100644 --- a/src/CoreShop/Bundle/IndexBundle/ProcessManager/IndexProcess.php +++ b/src/CoreShop/Bundle/IndexBundle/ProcessManager/IndexProcess.php @@ -1,17 +1,20 @@ getInterpreter(), InterpreterInterface::class, $interpreter) + sprintf('%s needs to implement "%s", "%s" given.', $column->getInterpreter(), InterpreterInterface::class, $interpreter), ); } diff --git a/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker.php b/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker.php index f40199a0d7..dc1f774742 100644 --- a/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker.php +++ b/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker.php @@ -1,17 +1,20 @@ database->executeQuery('DROP TABLE IF EXISTS `' . $this->getLocalizedTablename($index->getName()) . '`'); $this->database->executeQuery('DROP TABLE IF EXISTS `' . $this->getRelationTablename($index->getName()) . '`'); } catch (\Exception $e) { - $this->logger->error((string)$e); + $this->logger->error((string) $e); } } @@ -307,13 +310,13 @@ public function renameIndexStructures(IndexInterface $index, string $oldName, st sprintf( 'RENAME TABLE `%s` TO `%s`', $oldTable, - $newTable - ) + $newTable, + ), ); } } } catch (\Exception $e) { - $this->logger->error((string)$e); + $this->logger->error((string) $e); } } diff --git a/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/Listing.php b/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/Listing.php index 4ce56da685..190d32133c 100644 --- a/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/Listing.php +++ b/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/Listing.php @@ -1,17 +1,20 @@ worker instanceof MysqlWorker) { @@ -316,7 +320,7 @@ public function getGroupByRelationValuesAndType( $fieldName, $type, $countValues = false, - $fieldNameShouldBeExcluded = true + $fieldNameShouldBeExcluded = true, ) { $excludedFieldName = $fieldName; if (!$fieldNameShouldBeExcluded) { diff --git a/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/Listing/Dao.php b/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/Listing/Dao.php index a6b7a16ab2..47d10ad563 100644 --- a/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/Listing/Dao.php +++ b/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/Listing/Dao.php @@ -1,17 +1,20 @@ database->executeQuery($queryBuilder->getSQL()); - return (int)$stmt->fetchOne(); + return (int) $stmt->fetchOne(); } /** diff --git a/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/TableIndex.php b/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/TableIndex.php index 1559a87222..86d1b5a2cd 100644 --- a/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/TableIndex.php +++ b/src/CoreShop/Bundle/IndexBundle/Worker/MysqlWorker/TableIndex.php @@ -1,17 +1,20 @@ addDefaultsIfNotSet() ->children() ->scalarNode('checker')->defaultValue(AvailabilityChecker::class)->cannotBeEmpty()->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/InventoryBundle/DependencyInjection/CoreShopInventoryExtension.php b/src/CoreShop/Bundle/InventoryBundle/DependencyInjection/CoreShopInventoryExtension.php index 1bacda4a75..a5695d9234 100644 --- a/src/CoreShop/Bundle/InventoryBundle/DependencyInjection/CoreShopInventoryExtension.php +++ b/src/CoreShop/Bundle/InventoryBundle/DependencyInjection/CoreShopInventoryExtension.php @@ -1,17 +1,20 @@ availabilityChecker->isStockSufficient($stockable, $quantity)) { $this->context->addViolation( $constraint->message, - ['%stockable%' => $stockable->getInventoryName()] + ['%stockable%' => $stockable->getInventoryName()], ); } } diff --git a/src/CoreShop/Bundle/LocaleBundle/CoreShopLocaleBundle.php b/src/CoreShop/Bundle/LocaleBundle/CoreShopLocaleBundle.php index cb363833bb..8b5e8851ae 100644 --- a/src/CoreShop/Bundle/LocaleBundle/CoreShopLocaleBundle.php +++ b/src/CoreShop/Bundle/LocaleBundle/CoreShopLocaleBundle.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(LocaleContextInterface::class) - ->addTag(CompositeLocaleContextPass::LOCALE_CONTEXT_SERVICE_TAG); + ->addTag(CompositeLocaleContextPass::LOCALE_CONTEXT_SERVICE_TAG) + ; } } diff --git a/src/CoreShop/Bundle/LocaleBundle/Form/Type/LocaleChoiceType.php b/src/CoreShop/Bundle/LocaleBundle/Form/Type/LocaleChoiceType.php index 89af807c1b..188b64508b 100644 --- a/src/CoreShop/Bundle/LocaleBundle/Form/Type/LocaleChoiceType.php +++ b/src/CoreShop/Bundle/LocaleBundle/Form/Type/LocaleChoiceType.php @@ -1,17 +1,20 @@ false, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/MenuBundle/Builder.php b/src/CoreShop/Bundle/MenuBundle/Builder.php index e03a1f0de2..6afbd09738 100644 --- a/src/CoreShop/Bundle/MenuBundle/Builder.php +++ b/src/CoreShop/Bundle/MenuBundle/Builder.php @@ -1,17 +1,20 @@ setDefinition('coreshop.menu.builder.' . $type, $builderService); diff --git a/src/CoreShop/Bundle/MenuBundle/DependencyInjection/CoreShopMenuExtension.php b/src/CoreShop/Bundle/MenuBundle/DependencyInjection/CoreShopMenuExtension.php index 79c8d1dd8b..80c74ef3c8 100644 --- a/src/CoreShop/Bundle/MenuBundle/DependencyInjection/CoreShopMenuExtension.php +++ b/src/CoreShop/Bundle/MenuBundle/DependencyInjection/CoreShopMenuExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(MenuBuilderInterface::class) - ->addTag(MenuBuilderPass::MENU_BUILDER_TAG); + ->addTag(MenuBuilderPass::MENU_BUILDER_TAG) + ; } } diff --git a/src/CoreShop/Bundle/MenuBundle/EventListener/PimcoreAdminListener.php b/src/CoreShop/Bundle/MenuBundle/EventListener/PimcoreAdminListener.php index ae795a3f03..899f8bebde 100644 --- a/src/CoreShop/Bundle/MenuBundle/EventListener/PimcoreAdminListener.php +++ b/src/CoreShop/Bundle/MenuBundle/EventListener/PimcoreAdminListener.php @@ -1,17 +1,20 @@ 'addJsFiles' + BundleManagerEvents::JS_PATHS => 'addJsFiles', ]; } @@ -33,9 +36,9 @@ public function addJSFiles(PathsEvent $event) array_merge( $event->getPaths(), [ - '/bundles/coreshopmenu/pimcore/js/events.js' - ] - ) + '/bundles/coreshopmenu/pimcore/js/events.js', + ], + ), ); } -} \ No newline at end of file +} diff --git a/src/CoreShop/Bundle/MenuBundle/Guard/PimcoreGuard.php b/src/CoreShop/Bundle/MenuBundle/Guard/PimcoreGuard.php index 41ec24c35c..c0254360d9 100644 --- a/src/CoreShop/Bundle/MenuBundle/Guard/PimcoreGuard.php +++ b/src/CoreShop/Bundle/MenuBundle/Guard/PimcoreGuard.php @@ -1,17 +1,20 @@ tokenStorageUserResolver->getUser(); if ($user instanceof User) { - return $user->isAllowed((string)$item->getAttribute('permission')); + return $user->isAllowed((string) $item->getAttribute('permission')); } return false; diff --git a/src/CoreShop/Bundle/MenuBundle/Renderer/JsonRenderer.php b/src/CoreShop/Bundle/MenuBundle/Renderer/JsonRenderer.php index f511634533..6f4793a288 100644 --- a/src/CoreShop/Bundle/MenuBundle/Renderer/JsonRenderer.php +++ b/src/CoreShop/Bundle/MenuBundle/Renderer/JsonRenderer.php @@ -1,17 +1,20 @@ defaultOptions = array_merge([ 'depth' => null, @@ -52,7 +55,7 @@ public function render(ItemInterface $item, array $options = []): string 'item' => $this->renderItem($item), 'items' => $items, 'options' => $options, - ] + ], ); } @@ -130,7 +133,7 @@ public function reorderMenuItems(ItemInterface $menu): void $menuOrderArray = array_merge( array_slice($menuOrderArray, 0, $position), [$value], - array_slice($menuOrderArray, $position) + array_slice($menuOrderArray, $position), ); } } diff --git a/src/CoreShop/Bundle/MoneyBundle/CoreExtension/Money.php b/src/CoreShop/Bundle/MoneyBundle/CoreExtension/Money.php index 9b1ab033e5..cbdb15013a 100644 --- a/src/CoreShop/Bundle/MoneyBundle/CoreExtension/Money.php +++ b/src/CoreShop/Bundle/MoneyBundle/CoreExtension/Money.php @@ -1,17 +1,20 @@ 0) { + if (strlen((string) $defaultValue) > 0) { $this->defaultValue = $defaultValue; } @@ -165,17 +168,11 @@ public function getMinValue() return $this->minValue; } - /** - * @return bool - */ public function getNullable(): bool { return $this->nullable; } - /** - * @param bool $nullable - */ public function setNullable(bool $nullable): void { $this->nullable = $nullable; @@ -218,7 +215,7 @@ public function unmarshalRecycleData($object, $data) public function getDataForResource($data, $object = null, $params = []) { if (is_numeric($data) && !is_int($data)) { - $data = (int)$data; + $data = (int) $data; } if (is_int($data)) { @@ -255,7 +252,7 @@ public function getGetterCode($class) $code .= '* Get ' . str_replace(['/**', '*/', '//'], '', $this->getName()) . ' - ' . str_replace(['/**', '*/', '//'], '', $this->getTitle()) . "\n"; $code .= '* @return ' . $this->getPhpdocReturnType() . "\n"; $code .= '*/' . "\n"; - $code .= 'public function get' . ucfirst($key) . " (): ".($this->nullable ? '?' : '')."int {\n"; + $code .= 'public function get' . ucfirst($key) . ' (): ' . ($this->nullable ? '?' : '') . "int {\n"; $code .= $this->getPreGetValueHookCode($key); @@ -313,7 +310,7 @@ public function getSetterCode($class) $code .= '* @param ' . $this->getPhpdocReturnType() . ' $' . $key . "\n"; $code .= '* @return ' . $returnType . "\n"; $code .= '*/' . "\n"; - $code .= 'public function set' . ucfirst($key) . ' ('.($this->nullable ? '?' : '').'int ' . '$' . $key . ") {\n"; + $code .= 'public function set' . ucfirst($key) . ' (' . ($this->nullable ? '?' : '') . 'int ' . '$' . $key . ") {\n"; $code .= "\t" . '$fd = $this->getClass()->getFieldDefinition("' . $key . '");' . "\n"; if ($this instanceof DataObject\ClassDefinition\Data\EncryptedField) { @@ -354,7 +351,7 @@ public function getGetterCodeObjectbrick($brickClass) $code .= '* Get ' . str_replace(['/**', '*/', '//'], '', $this->getName()) . ' - ' . str_replace(['/**', '*/', '//'], '', $this->getTitle()) . "\n"; $code .= '* @return ' . $this->getPhpdocReturnType() . "\n"; $code .= '*/' . "\n"; - $code .= 'public function get' . ucfirst($key) . " (): ".($this->nullable ? '?' : '')." {\n"; + $code .= 'public function get' . ucfirst($key) . ' (): ' . ($this->nullable ? '?' : '') . " {\n"; if (method_exists($this, 'preGetData')) { $code .= "\t" . '$data = $this->getDefinition()->getFieldDefinition("' . $key . '")->preGetData($this);' . "\n"; @@ -392,7 +389,7 @@ public function getSetterCodeObjectbrick($brickClass) $code .= '* @param ' . $this->getPhpdocReturnType() . ' $' . $key . "\n"; $code .= '* @return \\Pimcore\\Model\\DataObject\\Objectbrick\\Data\\' . ucfirst($brickClass->getKey()) . "\n"; $code .= '*/' . "\n"; - $code .= 'public function set' . ucfirst($key) . ' ('.($this->nullable ? '?' : '').'int ' . '$' . $key . ") {\n"; + $code .= 'public function set' . ucfirst($key) . ' (' . ($this->nullable ? '?' : '') . 'int ' . '$' . $key . ") {\n"; $code .= "\t" . '$fd = $this->getDefinition()->getFieldDefinition("' . $key . '");' . "\n"; if ($this instanceof DataObject\ClassDefinition\Data\EncryptedField) { @@ -434,7 +431,7 @@ public function getGetterCodeFieldcollection($fieldcollectionDefinition) $code .= '* Get ' . str_replace(['/**', '*/', '//'], '', $this->getName()) . ' - ' . str_replace(['/**', '*/', '//'], '', $this->getTitle()) . "\n"; $code .= '* @return ' . $this->getPhpdocReturnType() . "\n"; $code .= '*/' . "\n"; - $code .= 'public function get' . ucfirst($key) . " (): ".($this->nullable ? '?' : '')."int {\n"; + $code .= 'public function get' . ucfirst($key) . ' (): ' . ($this->nullable ? '?' : '') . "int {\n"; if (method_exists($this, 'preGetData')) { $code .= "\t" . '$container = $this;' . "\n"; @@ -464,7 +461,7 @@ public function getSetterCodeFieldcollection($fieldcollectionDefinition) $code .= '* @param ' . $this->getPhpdocReturnType() . ' $' . $key . "\n"; $code .= '* @return \\Pimcore\\Model\\DataObject\\Fieldcollection\\Data\\' . ucfirst($fieldcollectionDefinition->getKey()) . "\n"; $code .= '*/' . "\n"; - $code .= 'public function set' . ucfirst($key) . ' ('.($this->nullable ? '?' : '').'int ' . '$' . $key . ") {\n"; + $code .= 'public function set' . ucfirst($key) . ' (' . ($this->nullable ? '?' : '') . 'int ' . '$' . $key . ") {\n"; $code .= "\t" . '$fd = $this->getDefinition()->getFieldDefinition("' . $key . '");' . "\n"; if ($this instanceof DataObject\ClassDefinition\Data\EncryptedField) { @@ -504,7 +501,7 @@ public function getGetterCodeLocalizedfields($class) $code .= '* Get ' . str_replace(['/**', '*/', '//'], '', $this->getName()) . ' - ' . str_replace(['/**', '*/', '//'], '', $this->getTitle()) . "\n"; $code .= '* @return ' . $this->getPhpdocReturnType() . "\n"; $code .= '*/' . "\n"; - $code .= 'public function get' . ucfirst($key) . ' ($language = null): '.($this->nullable ? '?' : '').'int {' . "\n"; + $code .= 'public function get' . ucfirst($key) . ' ($language = null): ' . ($this->nullable ? '?' : '') . 'int {' . "\n"; $code .= "\t" . '$data = $this->getLocalizedfields()->getLocalizedValue("' . $key . '", $language);' . "\n"; @@ -544,7 +541,7 @@ public function getSetterCodeLocalizedfields($class) $code .= '* @param ' . $this->getPhpdocReturnType() . ' $' . $key . "\n"; $code .= '* @return \\Pimcore\\Model\\DataObject\\' . ucfirst($classname) . "\n"; $code .= '*/' . "\n"; - $code .= 'public function set' . ucfirst($key) . ' ('.($this->nullable ? '?' : '').'int ' . '$' . $key . ', $language = null) {' . "\n"; + $code .= 'public function set' . ucfirst($key) . ' (' . ($this->nullable ? '?' : '') . 'int ' . '$' . $key . ', $language = null) {' . "\n"; if ($this->supportsDirtyDetection()) { $code .= "\t" . '$fd = $this->' . $containerGetter . '()->getFieldDefinition("localizedfields")->getFieldDefinition("' . $key . '");' . "\n"; } @@ -604,7 +601,7 @@ public function getDataForEditmode($data, $object = null, $params = []) public function getDataFromEditmode($data, $object = null, $params = []) { if (is_numeric($data)) { - return (int)round((round((float)$data, $this->getDecimalPrecision()) * $this->getDecimalFactor()), 0); + return (int) round((round((float) $data, $this->getDecimalPrecision()) * $this->getDecimalFactor()), 0); } return $data; @@ -646,7 +643,7 @@ public function getForCsvExport($object, $params = []) { $data = $this->getDataFromObjectParam($object, $params); - return (string)$data; + return (string) $data; } public function getFromCsvImport($importValue, $object = null, $params = []) @@ -695,10 +692,10 @@ protected function getDecimalPrecision() */ protected function toNumeric($value): float|int { - if (!str_contains((string)$value, '.')) { - return (int)$value; + if (!str_contains((string) $value, '.')) { + return (int) $value; } - return (float)$value; + return (float) $value; } } diff --git a/src/CoreShop/Bundle/MoneyBundle/CoreShopMoneyBundle.php b/src/CoreShop/Bundle/MoneyBundle/CoreShopMoneyBundle.php index 24b1badc33..95c3ceab16 100644 --- a/src/CoreShop/Bundle/MoneyBundle/CoreShopMoneyBundle.php +++ b/src/CoreShop/Bundle/MoneyBundle/CoreShopMoneyBundle.php @@ -1,17 +1,20 @@ $fieldDefinition->getName(), 'type' => $this->getFieldType($fieldDefinition, $class, $container), ], - $container + $container, ); } diff --git a/src/CoreShop/Bundle/MoneyBundle/DependencyInjection/Configuration.php b/src/CoreShop/Bundle/MoneyBundle/DependencyInjection/Configuration.php index 7ecb3ae586..9bbc6915fa 100644 --- a/src/CoreShop/Bundle/MoneyBundle/DependencyInjection/Configuration.php +++ b/src/CoreShop/Bundle/MoneyBundle/DependencyInjection/Configuration.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/MoneyBundle/DependencyInjection/CoreShopMoneyExtension.php b/src/CoreShop/Bundle/MoneyBundle/DependencyInjection/CoreShopMoneyExtension.php index 934786f073..f55da66fe7 100644 --- a/src/CoreShop/Bundle/MoneyBundle/DependencyInjection/CoreShopMoneyExtension.php +++ b/src/CoreShop/Bundle/MoneyBundle/DependencyInjection/CoreShopMoneyExtension.php @@ -1,17 +1,20 @@ decimalFactor); + return (int) round($value * $this->decimalFactor); } } diff --git a/src/CoreShop/Bundle/MoneyBundle/Form/Type/MoneyType.php b/src/CoreShop/Bundle/MoneyBundle/Form/Type/MoneyType.php index a93b38e632..50bc2acb34 100644 --- a/src/CoreShop/Bundle/MoneyBundle/Form/Type/MoneyType.php +++ b/src/CoreShop/Bundle/MoneyBundle/Form/Type/MoneyType.php @@ -1,17 +1,20 @@ addModelTransformer( - new MoneyToIntegerTransformer($this->decimalFactor) + new MoneyToIntegerTransformer($this->decimalFactor), ); } diff --git a/src/CoreShop/Bundle/MoneyBundle/Formatter/MoneyFormatter.php b/src/CoreShop/Bundle/MoneyBundle/Formatter/MoneyFormatter.php index 3b87a0ca96..6925c1aa98 100644 --- a/src/CoreShop/Bundle/MoneyBundle/Formatter/MoneyFormatter.php +++ b/src/CoreShop/Bundle/MoneyBundle/Formatter/MoneyFormatter.php @@ -1,17 +1,20 @@ = 0 ? $result : '-' . $result; diff --git a/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/css/money.css b/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/css/money.css index 6de12c5374..27f51494e8 100644 --- a/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/css/money.css +++ b/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/css/money.css @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ .coreshop_icon_money, .pimcore_icon_coreShopMoney{ diff --git a/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/js/coreExtension/data/coreShopMoney.js b/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/js/coreExtension/data/coreShopMoney.js index 4cfd7f2da8..ba23d69b61 100755 --- a/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/js/coreExtension/data/coreShopMoney.js +++ b/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/js/coreExtension/data/coreShopMoney.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS("pimcore.object.classes.data.coreShopMoney"); diff --git a/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopMoney.js b/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopMoney.js index 396257f50c..b9a52a7b2e 100755 --- a/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopMoney.js +++ b/src/CoreShop/Bundle/MoneyBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopMoney.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS("pimcore.object.tags.coreShopMoney"); diff --git a/src/CoreShop/Bundle/MoneyBundle/Twig/FormatMoneyExtension.php b/src/CoreShop/Bundle/MoneyBundle/Twig/FormatMoneyExtension.php index a6ea9c712d..44e2a2e509 100644 --- a/src/CoreShop/Bundle/MoneyBundle/Twig/FormatMoneyExtension.php +++ b/src/CoreShop/Bundle/MoneyBundle/Twig/FormatMoneyExtension.php @@ -1,17 +1,20 @@ type . '-' . $type] + [ConditionCheckerInterface::class, 'notification-rule-' . $this->type . '-' . $type], ); $formRegistries[$type] = new Definition( - FormTypeRegistry::class + FormTypeRegistry::class, ); $types[] = $type; diff --git a/src/CoreShop/Bundle/NotificationBundle/DependencyInjection/Compiler/NotificationRuleActionPass.php b/src/CoreShop/Bundle/NotificationBundle/DependencyInjection/Compiler/NotificationRuleActionPass.php index 9877b7f0fe..d35002defc 100644 --- a/src/CoreShop/Bundle/NotificationBundle/DependencyInjection/Compiler/NotificationRuleActionPass.php +++ b/src/CoreShop/Bundle/NotificationBundle/DependencyInjection/Compiler/NotificationRuleActionPass.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -96,6 +100,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/NotificationBundle/DependencyInjection/CoreShopNotificationExtension.php b/src/CoreShop/Bundle/NotificationBundle/DependencyInjection/CoreShopNotificationExtension.php index 2ddecbf65e..1b0e2406f7 100644 --- a/src/CoreShop/Bundle/NotificationBundle/DependencyInjection/CoreShopNotificationExtension.php +++ b/src/CoreShop/Bundle/NotificationBundle/DependencyInjection/CoreShopNotificationExtension.php @@ -1,17 +1,20 @@ setParameter('type', $type) ->setParameter('active', true) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/NotificationBundle/EventListener/NotificationRuleEventListener.php b/src/CoreShop/Bundle/NotificationBundle/EventListener/NotificationRuleEventListener.php index 599ec790bc..68dd8bdccf 100644 --- a/src/CoreShop/Bundle/NotificationBundle/EventListener/NotificationRuleEventListener.php +++ b/src/CoreShop/Bundle/NotificationBundle/EventListener/NotificationRuleEventListener.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleConditionChoiceType.php b/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleConditionChoiceType.php index 183b8337d3..3bc72d9ba2 100644 --- a/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleConditionChoiceType.php +++ b/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleConditionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleType.php b/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleType.php index 212c005a0e..a3e4ec07b8 100644 --- a/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleType.php +++ b/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleType.php @@ -1,17 +1,20 @@ add('active', CheckboxType::class) ->add('type', NotificationRuleTypeChoiceType::class) ->add('conditions', NotificationRuleConditionCollectionType::class) - ->add('actions', NotificationRuleActionCollectionType::class); + ->add('actions', NotificationRuleActionCollectionType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleTypeChoiceType.php b/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleTypeChoiceType.php index fdef8ca1f3..e2fe3e2472 100644 --- a/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleTypeChoiceType.php +++ b/src/CoreShop/Bundle/NotificationBundle/Form/Type/NotificationRuleTypeChoiceType.php @@ -1,17 +1,20 @@ true, 'allow_delete' => true, ]) - ->add('doNotSendToDesignatedRecipient', CheckboxType::class); + ->add('doNotSendToDesignatedRecipient', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/NotificationBundle/Processor/EventedRuleProcessor.php b/src/CoreShop/Bundle/NotificationBundle/Processor/EventedRuleProcessor.php index cdec262665..d52572ab0d 100644 --- a/src/CoreShop/Bundle/NotificationBundle/Processor/EventedRuleProcessor.php +++ b/src/CoreShop/Bundle/NotificationBundle/Processor/EventedRuleProcessor.php @@ -1,17 +1,20 @@ setParameter('id', $object->getId()) ; - $currentVersion = (int)$this->connection->fetchOne($queryBuilder->getSQL(), $queryBuilder->getParameters()); + $currentVersion = (int) $this->connection->fetchOne($queryBuilder->getSQL(), $queryBuilder->getParameters()); if ($currentVersion === $object->getOptimisticLockVersion()) { return; @@ -119,7 +124,7 @@ private function ensureVersionMatch(Concrete $object): void throw OptimisticLockException::lockFailedVersionMismatch( $object, $object->getOptimisticLockVersion(), - $currentVersion + $currentVersion, ); } } diff --git a/src/CoreShop/Bundle/OptimisticEntityLockBundle/Exception/OptimisticLockException.php b/src/CoreShop/Bundle/OptimisticEntityLockBundle/Exception/OptimisticLockException.php index facfa0b8c0..845ce71701 100644 --- a/src/CoreShop/Bundle/OptimisticEntityLockBundle/Exception/OptimisticLockException.php +++ b/src/CoreShop/Bundle/OptimisticEntityLockBundle/Exception/OptimisticLockException.php @@ -1,25 +1,30 @@ data = [ 'cart' => null, diff --git a/src/CoreShop/Bundle/OrderBundle/Command/CartExpireCommand.php b/src/CoreShop/Bundle/OrderBundle/Command/CartExpireCommand.php index 222706a9a6..c6f76b9f07 100644 --- a/src/CoreShop/Bundle/OrderBundle/Command/CartExpireCommand.php +++ b/src/CoreShop/Bundle/OrderBundle/Command/CartExpireCommand.php @@ -1,17 +1,20 @@ addOption( 'anonymous', 'a', InputOption::VALUE_NONE, - 'Delete only anonymous carts' + 'Delete only anonymous carts', ) ->addOption( 'user', 'u', InputOption::VALUE_NONE, - 'Delete only user carts' - ); + 'Delete only user carts', + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int @@ -58,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $params = $this->params; if ($input->getOption('days')) { - $days = (int)$input->getOption('days'); + $days = (int) $input->getOption('days'); } if ($input->getOption('anonymous')) { diff --git a/src/CoreShop/Bundle/OrderBundle/Command/OrderExpireCommand.php b/src/CoreShop/Bundle/OrderBundle/Command/OrderExpireCommand.php index a0d18119cd..b9f8a2b401 100644 --- a/src/CoreShop/Bundle/OrderBundle/Command/OrderExpireCommand.php +++ b/src/CoreShop/Bundle/OrderBundle/Command/OrderExpireCommand.php @@ -1,17 +1,20 @@ days; if ($input->getOption('days')) { - $days = (int)$input->getOption('days'); + $days = (int) $input->getOption('days'); } $output->writeln('Running order expire job, this could take some time.'); diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/AddressCreationController.php b/src/CoreShop/Bundle/OrderBundle/Controller/AddressCreationController.php index 8bfab1f173..552e6deec6 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/AddressCreationController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/AddressCreationController.php @@ -1,17 +1,20 @@ get('form.factory')->createNamed('', AdminAddressCreationType::class); @@ -56,7 +59,7 @@ public function createAddressAction( $address->setParent($objectService->createFolderByPath(sprintf( '/%s/%s', $customer->getFullPath(), - (string)$this->container->getParameter('coreshop.folder.address') + (string) $this->container->getParameter('coreshop.folder.address'), ))); $address->save(); @@ -78,7 +81,7 @@ public function createAddressAction( [ 'success' => false, 'message' => $errorSerializer->serializeErrorFromHandledForm($form), - ] + ], ); } diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/CartPriceRuleController.php b/src/CoreShop/Bundle/OrderBundle/Controller/CartPriceRuleController.php index efcdd56f94..34588eb395 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/CartPriceRuleController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/CartPriceRuleController.php @@ -1,17 +1,20 @@ getVoucherCodeRepository()->findAllPaginator( $cartPriceRule, - (int)$this->getParameterFromRequest($request, 'start', 0), - (int)$this->getParameterFromRequest($request, 'limit', 50) + (int) $this->getParameterFromRequest($request, 'start', 0), + (int) $this->getParameterFromRequest($request, 'limit', 50), ); return $this->viewHandler->handle( @@ -79,7 +82,7 @@ public function getVoucherCodesAction(Request $request): JsonResponse ], [ 'group' => 'Detailed', - ] + ], ); } @@ -158,8 +161,8 @@ public function exportVoucherCodesAction(Request $request): void $codes = $this->getVoucherCodeRepository()->findAllPaginator( $priceRule, - (int)$this->getParameterFromRequest($request, 'start', 0), - (int)$this->getParameterFromRequest($request, 'limit', 50) + (int) $this->getParameterFromRequest($request, 'start', 0), + (int) $this->getParameterFromRequest($request, 'limit', 50), ); foreach ($codes as $code) { diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/CustomerCreationController.php b/src/CoreShop/Bundle/OrderBundle/Controller/CustomerCreationController.php index 9227be7b1e..907402902f 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/CustomerCreationController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/CustomerCreationController.php @@ -1,17 +1,20 @@ get('form.factory')->createNamed('', AdminCustomerCreationType::class); @@ -60,8 +63,8 @@ public function createCustomerAction( [ 'path' => 'guest', 'suffix' => mb_strtoupper(mb_substr($customer->getLastname(), 0, 1)), - ] - ) + ], + ), ); $customer->setPublished(true); @@ -76,8 +79,8 @@ public function createCustomerAction( $address->setParent( $folderCreationService->createFolderForResource( $address, - ['prefix' => $customer->getFullPath()] - ) + ['prefix' => $customer->getFullPath()], + ), ); $address->save(); @@ -103,7 +106,7 @@ public function createCustomerAction( [ 'success' => false, 'message' => $errorSerializer->serializeErrorFromHandledForm($form), - ] + ], ); } diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/OrderCommentController.php b/src/CoreShop/Bundle/OrderBundle/Controller/OrderCommentController.php index b787206124..fdf1389bd4 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/OrderCommentController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/OrderCommentController.php @@ -1,17 +1,20 @@ getParameterFromRequest($request,'id'); + $commentId = $this->getParameterFromRequest($request, 'id'); $objectNoteService = $this->get(NoteServiceInterface::class); $commentEntity = $objectNoteService->getNoteById($commentId); diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/OrderController.php b/src/CoreShop/Bundle/OrderBundle/Controller/OrderController.php index fa7eab84de..429cecc195 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/OrderController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/OrderController.php @@ -1,17 +1,20 @@ getName()]['froms'] = array_merge( $transitions[$identifier][$transition->getName()]['froms'], - $transition->getFroms() + $transition->getFroms(), ); $transitions[$identifier][$transition->getName()]['tos'] = array_merge( $transitions[$identifier][$transition->getName()]['tos'], - $transition->getFroms() + $transition->getFroms(), ); } @@ -132,10 +135,10 @@ public function getStatesAction(Request $request): Response public function updateOrderStateAction( Request $request, OrderRepositoryInterface $orderRepository, - StateMachineManagerInterface $stateMachineManager + StateMachineManagerInterface $stateMachineManager, ): Response { $orderId = $this->getParameterFromRequest($request, 'o_id'); - $transition = $this->getParameterFromRequest($request,'transition'); + $transition = $this->getParameterFromRequest($request, 'transition'); $order = $orderRepository->find($orderId); if (!$order instanceof OrderInterface) { @@ -153,7 +156,7 @@ public function updateOrderStateAction( if ($order instanceof DataObject\Concrete && $transition === OrderTransitions::TRANSITION_CANCEL) { $this->get(HistoryLogger::class)->log( $order, - 'Admin Order Cancellation' + 'Admin Order Cancellation', ); } @@ -167,10 +170,10 @@ public function getFolderConfigurationAction(Request $request): Response $name = null; $folderId = null; - $type = $this->getParameterFromRequest($request,'saleType', 'order'); + $type = $this->getParameterFromRequest($request, 'saleType', 'order'); - $orderClassId = (string)$this->container->getParameter('coreshop.model.order.pimcore_class_name'); - $folderPath = (string)$this->container->getParameter('coreshop.folder.' . $type); + $orderClassId = (string) $this->container->getParameter('coreshop.model.order.pimcore_class_name'); + $folderPath = (string) $this->container->getParameter('coreshop.folder.' . $type); $orderClassDefinition = DataObject\ClassDefinition::getByName($orderClassId); $folder = DataObject::getByPath('/' . $folderPath); @@ -201,8 +204,8 @@ public function listAction(Request $request, OrderRepositoryInterface $orderRepo $conditionFilters = []; /** @psalm-suppress InternalMethod */ $conditionFilters[] = $gridHelper->getFilterCondition( - $this->getParameterFromRequest($request,'filter'), - DataObject\ClassDefinition::getByName((string)$this->container->getParameter('coreshop.model.order.pimcore_class_name')) + $this->getParameterFromRequest($request, 'filter'), + DataObject\ClassDefinition::getByName((string) $this->container->getParameter('coreshop.model.order.pimcore_class_name')), ); if (count($conditionFilters) > 0 && $conditionFilters[0] !== '(())') { $list->setCondition(implode(' AND ', $conditionFilters)); @@ -247,7 +250,7 @@ public function detailAction(Request $request, OrderRepositoryInterface $orderRe { $this->isGrantedOr403(); - $orderId = $this->getParameterFromRequest($request,'id'); + $orderId = $this->getParameterFromRequest($request, 'id'); $order = $orderRepository->find($orderId); if (!$order instanceof OrderInterface) { @@ -263,7 +266,7 @@ public function findOrderAction(Request $request, OrderRepositoryInterface $orde { $this->isGrantedOr403(); - $number = $this->getParameterFromRequest($request,'number'); + $number = $this->getParameterFromRequest($request, 'number'); if ($number) { $list = $orderRepository->getList(); @@ -310,7 +313,7 @@ protected function prepareSale(OrderInterface $order): array return array_merge( $element, $this->prepareAddress($order->getShippingAddress(), 'shipping'), - $this->prepareAddress($order->getInvoiceAddress(), 'invoice') + $this->prepareAddress($order->getInvoiceAddress(), 'invoice'), ); } @@ -319,7 +322,7 @@ protected function prepareAddress(AddressInterface $address, string $type): arra $prefix = 'address' . ucfirst($type); $values = []; $fullAddress = []; - $classDefinition = DataObject\ClassDefinition::getByName((string)$this->container->getParameter('coreshop.model.address.pimcore_class_name')); + $classDefinition = DataObject\ClassDefinition::getByName((string) $this->container->getParameter('coreshop.model.address.pimcore_class_name')); foreach ($classDefinition->getFieldDefinitions() as $fieldDefinition) { $value = ''; @@ -636,7 +639,7 @@ protected function getPayments(OrderInterface $order): array } if (false === is_string($detailValue)) { - $detailValue = (string)$detailValue; + $detailValue = (string) $detailValue; } $details[] = [$detailName, $detailValue ? htmlentities($detailValue) : '']; diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/OrderCreationController.php b/src/CoreShop/Bundle/OrderBundle/Controller/OrderCreationController.php index 75fa4c1f56..29433ce82b 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/OrderCreationController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/OrderCreationController.php @@ -1,17 +1,20 @@ isGrantedOr403(); @@ -66,7 +69,7 @@ public function salePreviewAction( Request $request, FactoryInterface $orderFactory, FormFactoryInterface $formFactory, - CartProcessorInterface $cartProcessor + CartProcessorInterface $cartProcessor, ): Response { $cart = $orderFactory->createNew(); $form = $formFactory->createNamed('', CartCreationType::class, $cart, [ @@ -96,11 +99,11 @@ public function saleCreationAction( FormFactoryInterface $formFactory, CartManagerInterface $cartManager, ErrorSerializer $errorSerializer, - StateMachineManagerInterface $manager + StateMachineManagerInterface $manager, ): Response { $this->isGrantedOr403(); - $type = $this->getParameterFromRequest($request,'saleType', OrderSaleTransitions::TRANSITION_CART); + $type = $this->getParameterFromRequest($request, 'saleType', OrderSaleTransitions::TRANSITION_CART); $cart = $orderFactory->createNew(); $form = $formFactory->createNamed('', CartCreationType::class, $cart, [ @@ -115,7 +118,7 @@ public function saleCreationAction( [ 'success' => false, 'message' => $errorSerializer->serializeErrorFromHandledForm($form), - ] + ], ); } diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/OrderDocumentPrintController.php b/src/CoreShop/Bundle/OrderBundle/Controller/OrderDocumentPrintController.php index 2d4ac15978..74e0da4976 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/OrderDocumentPrintController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/OrderDocumentPrintController.php @@ -1,17 +1,20 @@ isGrantedOr403(); @@ -52,7 +55,7 @@ public function editItemsAction( if (!$cart instanceof OrderInterface) { return $this->viewHandler->handle( - ['success' => false, 'message' => "Order with ID '$cartId' not found"] + ['success' => false, 'message' => "Order with ID '$cartId' not found"], ); } @@ -88,7 +91,7 @@ public function addItemsAction( FormFactoryInterface $formFactory, ErrorSerializer $errorSerializer, CartManagerInterface $cartManager, - CartModifier $cartModifier + CartModifier $cartModifier, ): JsonResponse { $this->isGrantedOr403(); @@ -97,13 +100,13 @@ public function addItemsAction( if (!$cart instanceof OrderInterface) { return $this->viewHandler->handle( - ['success' => false, 'message' => "Order with ID '$cartId' not found"] + ['success' => false, 'message' => "Order with ID '$cartId' not found"], ); } $commands = []; - foreach ($this->getParameterFromRequest($request,'items', []) as $product) { + foreach ($this->getParameterFromRequest($request, 'items', []) as $product) { $productId = $product['cartItem']['purchasable']; $product = $purchasableStackRepository->find($productId); @@ -133,7 +136,7 @@ public function addItemsAction( foreach ($addsToCart->getItems() as $addToCart) { $cartModifier->addToList( $addToCart->getCart(), - $addToCart->getCartItem() + $addToCart->getCartItem(), ); } @@ -156,7 +159,7 @@ public function removeItemAction( OrderRepositoryInterface $orderRepository, OrderItemRepositoryInterface $orderItemRepository, CartManagerInterface $cartManager, - CartModifier $cartModifier + CartModifier $cartModifier, ): JsonResponse { $this->isGrantedOr403(); @@ -165,22 +168,22 @@ public function removeItemAction( if (!$cart instanceof OrderInterface) { return $this->viewHandler->handle( - ['success' => false, 'message' => "Order with ID '$cartId' not found"] + ['success' => false, 'message' => "Order with ID '$cartId' not found"], ); } - $cartItemId = $this->getParameterFromRequest($request,'cartItem'); + $cartItemId = $this->getParameterFromRequest($request, 'cartItem'); $cartItem = $orderItemRepository->find($cartItemId); if (!$cartItem instanceof OrderItemInterface) { return $this->viewHandler->handle( - ['success' => false, 'message' => "Order Item with ID '$cartItemId' not found"] + ['success' => false, 'message' => "Order Item with ID '$cartItemId' not found"], ); } if ($cartItem->getOrder()->getId() !== $cart->getId()) { return $this->viewHandler->handle( - ['success' => false, 'message' => 'Not allowed'] + ['success' => false, 'message' => 'Not allowed'], ); } @@ -192,7 +195,7 @@ public function removeItemAction( protected function createMultipleAddToCart( AddMultipleToCartFactoryInterface $addMultipleToCartFactory, - array $addToCarts + array $addToCarts, ): AddMultipleToCartInterface { return $addMultipleToCartFactory->createWithMultipleAddToCarts($addToCarts); } @@ -200,7 +203,7 @@ protected function createMultipleAddToCart( protected function createAddToCart( AddToCartFactoryInterface $addToCartFactory, OrderInterface $cart, - OrderItemInterface $item + OrderItemInterface $item, ): AddToCartInterface { return $addToCartFactory->createWithCartAndCartItem($cart, $item); } diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/OrderInvoiceController.php b/src/CoreShop/Bundle/OrderBundle/Controller/OrderInvoiceController.php index 03fef47734..1e6a8c7d18 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/OrderInvoiceController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/OrderInvoiceController.php @@ -1,17 +1,20 @@ getParameterFromRequest($request,'id'); + $orderId = $this->getParameterFromRequest($request, 'id'); $form = $this->get('form.factory')->createNamed('', OrderInvoiceCreationType::class); @@ -98,7 +101,7 @@ public function createInvoiceAction(Request $request): JsonResponse [ 'success' => false, 'message' => $this->get(ErrorSerializer::class)->serializeErrorFromHandledForm($form), - ] + ], ); } diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/OrderPaymentController.php b/src/CoreShop/Bundle/OrderBundle/Controller/OrderPaymentController.php index abd48634ea..2e2fc58f20 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/OrderPaymentController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/OrderPaymentController.php @@ -1,17 +1,20 @@ getParameterFromRequest($request, 'o_id'); $order = $this->getSaleRepository()->find($orderId); - $amount = (int)round($this->getParameterFromRequest($request, 'amount', 0) * $this->container->getParameter('coreshop.currency.decimal_factor')); + $amount = (int) round($this->getParameterFromRequest($request, 'amount', 0) * $this->container->getParameter('coreshop.currency.decimal_factor')); $paymentProviderId = $this->getParameterFromRequest($request, 'paymentProvider'); @@ -129,7 +132,7 @@ public function addPaymentAction(Request $request): JsonResponse [ 'success' => false, 'message' => sprintf('Payment Provider %s not found', $this->getParameterFromRequest($request, 'paymentProvider')), - ] + ], ); } diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/OrderShipmentController.php b/src/CoreShop/Bundle/OrderBundle/Controller/OrderShipmentController.php index a1623db229..fa2ec26cb4 100644 --- a/src/CoreShop/Bundle/OrderBundle/Controller/OrderShipmentController.php +++ b/src/CoreShop/Bundle/OrderBundle/Controller/OrderShipmentController.php @@ -1,17 +1,20 @@ false, 'message' => $this->get(ErrorSerializer::class)->serializeErrorFromHandledForm($form), - ] + ], ); } @@ -163,7 +166,7 @@ public function updateStateAction(Request $request): JsonResponse public function renderAction(Request $request): Response { - $shipmentId = (int)$this->getParameterFromRequest($request, 'id'); + $shipmentId = (int) $this->getParameterFromRequest($request, 'id'); $shipment = $this->getOrderShipmentRepository()->find($shipmentId); if ($shipment instanceof OrderShipmentInterface) { diff --git a/src/CoreShop/Bundle/OrderBundle/CoreExtension/CartPriceRule.php b/src/CoreShop/Bundle/OrderBundle/CoreExtension/CartPriceRule.php index 7a7ac6f4df..29c84395a1 100644 --- a/src/CoreShop/Bundle/OrderBundle/CoreExtension/CartPriceRule.php +++ b/src/CoreShop/Bundle/OrderBundle/CoreExtension/CartPriceRule.php @@ -1,17 +1,20 @@ getDefinition($tag['manager']); - $priority = isset($tag['priority']) ? (int)$tag['priority'] : 0; + $priority = isset($tag['priority']) ? (int) $tag['priority'] : 0; $manager->addMethodCall('addValidator', [new Reference($id), $tag['type'], $priority]); } diff --git a/src/CoreShop/Bundle/OrderBundle/DependencyInjection/Configuration.php b/src/CoreShop/Bundle/OrderBundle/DependencyInjection/Configuration.php index c6a008b36e..9b8e69edcc 100644 --- a/src/CoreShop/Bundle/OrderBundle/DependencyInjection/Configuration.php +++ b/src/CoreShop/Bundle/OrderBundle/DependencyInjection/Configuration.php @@ -1,17 +1,20 @@ children() ->booleanNode('legacy_serialization')->defaultTrue()->end() - ->end(); + ->end() + ; $this->addModelsSection($rootNode); $this->addPimcoreResourcesSection($rootNode); $this->addCartCleanupSection($rootNode); @@ -97,7 +101,8 @@ private function addCartCleanupSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addStack(ArrayNodeDefinition $node): void @@ -115,7 +120,8 @@ private function addStack(ArrayNodeDefinition $node): void ->scalarNode('order_shipment_item')->defaultValue(OrderShipmentItemInterface::class)->cannotBeEmpty()->end() ->end() ->end() - ->end(); + ->end() + ; } private function addModelsSection(ArrayNodeDefinition $node): void @@ -362,7 +368,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -414,6 +421,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/OrderBundle/DependencyInjection/CoreShopOrderExtension.php b/src/CoreShop/Bundle/OrderBundle/DependencyInjection/CoreShopOrderExtension.php index af9cb94870..dae0c6d54d 100644 --- a/src/CoreShop/Bundle/OrderBundle/DependencyInjection/CoreShopOrderExtension.php +++ b/src/CoreShop/Bundle/OrderBundle/DependencyInjection/CoreShopOrderExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(CartPriceRuleActionProcessorInterface::class) - ->addTag(CartPriceRuleActionPass::CART_PRICE_RULE_ACTION_TAG); + ->addTag(CartPriceRuleActionPass::CART_PRICE_RULE_ACTION_TAG) + ; $container ->registerForAutoconfiguration(CartRuleConditionCheckerInterface::class) - ->addTag(CartPriceRuleConditionPass::CART_PRICE_RULE_CONDITION_TAG); + ->addTag(CartPriceRuleConditionPass::CART_PRICE_RULE_CONDITION_TAG) + ; $container ->registerForAutoconfiguration(PurchasableDiscountCalculatorInterface::class) - ->addTag(PurchasableDiscountCalculatorsPass::PURCHASABLE_DISCOUNT_CALCULATOR_TAG); + ->addTag(PurchasableDiscountCalculatorsPass::PURCHASABLE_DISCOUNT_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(PurchasableDiscountPriceCalculatorInterface::class) - ->addTag(PurchasableDiscountPriceCalculatorsPass::PURCHASABLE_DISCOUNT_PRICE_CALCULATOR_TAG); + ->addTag(PurchasableDiscountPriceCalculatorsPass::PURCHASABLE_DISCOUNT_PRICE_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(PurchasablePriceCalculatorInterface::class) - ->addTag(PurchasablePriceCalculatorsPass::PURCHASABLE_PRICE_CALCULATOR_TAG); + ->addTag(PurchasablePriceCalculatorsPass::PURCHASABLE_PRICE_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(PurchasableRetailPriceCalculatorInterface::class) - ->addTag(PurchasableRetailPriceCalculatorsPass::PURCHASABLE_RETAIL_PRICE_CALCULATOR_TAG); + ->addTag(PurchasableRetailPriceCalculatorsPass::PURCHASABLE_RETAIL_PRICE_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(PurchasableWholesalePriceCalculatorInterface::class) - ->addTag(PurchasableWholesalePriceCalculatorsPass::PURCHASABLE_WHOLESALE_PRICE_CALCULATOR_TAG); + ->addTag(PurchasableWholesalePriceCalculatorsPass::PURCHASABLE_WHOLESALE_PRICE_CALCULATOR_TAG) + ; } } diff --git a/src/CoreShop/Bundle/OrderBundle/Doctrine/ORM/CartPriceRuleRepository.php b/src/CoreShop/Bundle/OrderBundle/Doctrine/ORM/CartPriceRuleRepository.php index 9d1073600d..43424c855b 100644 --- a/src/CoreShop/Bundle/OrderBundle/Doctrine/ORM/CartPriceRuleRepository.php +++ b/src/CoreShop/Bundle/OrderBundle/Doctrine/ORM/CartPriceRuleRepository.php @@ -1,17 +1,20 @@ andWhere('o.isVoucherRule = :isVoucherRule') ->setParameter('isVoucherRule', false) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/OrderBundle/Doctrine/ORM/CartPriceRuleVoucherRepository.php b/src/CoreShop/Bundle/OrderBundle/Doctrine/ORM/CartPriceRuleVoucherRepository.php index 181e23ae8b..6decb54030 100644 --- a/src/CoreShop/Bundle/OrderBundle/Doctrine/ORM/CartPriceRuleVoucherRepository.php +++ b/src/CoreShop/Bundle/OrderBundle/Doctrine/ORM/CartPriceRuleVoucherRepository.php @@ -1,17 +1,20 @@ where('o.cartPriceRule = :cartPriceRule') ->setParameter('cartPriceRule', $cartPriceRule) ->setMaxResults($limit) - ->setFirstResult($offset) + ->setFirstResult($offset), ); } @@ -39,7 +42,8 @@ public function findByCode(string $code): ?CartPriceRuleVoucherCodeInterface ->andWhere('o.code = :code') ->setParameter('code', $code) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } public function countCodes(int $length, ?string $prefix = null, ?string $suffix = null): int @@ -54,7 +58,7 @@ public function countCodes(int $length, ?string $prefix = null, ?string $suffix $code = $prefix . '%' . $suffix; - return (int)$this->createQueryBuilder('o') + return (int) $this->createQueryBuilder('o') ->select('COUNT(o.id)') ->andWhere('LENGTH(o.code) = :length') ->andWhere('o.code LIKE :code') diff --git a/src/CoreShop/Bundle/OrderBundle/Event/AdminAddressCreationEvent.php b/src/CoreShop/Bundle/OrderBundle/Event/AdminAddressCreationEvent.php index 6a395dd4b4..0604d70e03 100644 --- a/src/CoreShop/Bundle/OrderBundle/Event/AdminAddressCreationEvent.php +++ b/src/CoreShop/Bundle/OrderBundle/Event/AdminAddressCreationEvent.php @@ -1,17 +1,20 @@ data = $data; } diff --git a/src/CoreShop/Bundle/OrderBundle/Event/AdminCustomerCreationEvent.php b/src/CoreShop/Bundle/OrderBundle/Event/AdminCustomerCreationEvent.php index 7646b019bb..d201897632 100644 --- a/src/CoreShop/Bundle/OrderBundle/Event/AdminCustomerCreationEvent.php +++ b/src/CoreShop/Bundle/OrderBundle/Event/AdminCustomerCreationEvent.php @@ -1,17 +1,20 @@ data = $data; } diff --git a/src/CoreShop/Bundle/OrderBundle/Event/WkhtmlOptionsEvent.php b/src/CoreShop/Bundle/OrderBundle/Event/WkhtmlOptionsEvent.php index 37b1bf63b4..5cec7e5a1c 100644 --- a/src/CoreShop/Bundle/OrderBundle/Event/WkhtmlOptionsEvent.php +++ b/src/CoreShop/Bundle/OrderBundle/Event/WkhtmlOptionsEvent.php @@ -1,17 +1,20 @@ set( sprintf('%s.%s', $this->sessionKeyName, $cart->getStore()->getId()), - $cart->getId() + $cart->getId(), ); } } diff --git a/src/CoreShop/Bundle/OrderBundle/Events.php b/src/CoreShop/Bundle/OrderBundle/Events.php index e59bbcf81e..350b4222a5 100644 --- a/src/CoreShop/Bundle/OrderBundle/Events.php +++ b/src/CoreShop/Bundle/OrderBundle/Events.php @@ -1,17 +1,20 @@ stateMachineApplier->apply( $order, OrderTransitions::IDENTIFIER, - OrderTransitions::TRANSITION_CANCEL + OrderTransitions::TRANSITION_CANCEL, ); if ($order instanceof Concrete) { $this->historyLogger->log( $order, - 'Automatic Expiration Order Cancellation' + 'Automatic Expiration Order Cancellation', ); } } diff --git a/src/CoreShop/Bundle/OrderBundle/Expiration/OrderExpirationInterface.php b/src/CoreShop/Bundle/OrderBundle/Expiration/OrderExpirationInterface.php index e83ee68b36..a731dfc1e9 100644 --- a/src/CoreShop/Bundle/OrderBundle/Expiration/OrderExpirationInterface.php +++ b/src/CoreShop/Bundle/OrderBundle/Expiration/OrderExpirationInterface.php @@ -1,17 +1,20 @@ getData(); - $this->cartItemQuantityModifier->modify($viewData, (float)$targetQuantity); + $this->cartItemQuantityModifier->modify($viewData, (float) $targetQuantity); continue; } @@ -56,7 +61,7 @@ public function mapFormsToData($forms, &$viewData): void if (null !== $quantityForm) { $targetQuantity = $quantityForm->getData(); - $this->cartItemQuantityModifier->modify($viewData, (float)$targetQuantity); + $this->cartItemQuantityModifier->modify($viewData, (float) $targetQuantity); } } } diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/AddMultipleToCartType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/AddMultipleToCartType.php index fe2b3ef541..6ffa34c602 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/AddMultipleToCartType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/AddMultipleToCartType.php @@ -1,17 +1,20 @@ [ new Valid(['groups' => ['coreshop']]), ], - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/AdminCustomerCreationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/AdminCustomerCreationType.php index 97a5b86899..c5461ba69a 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/AdminCustomerCreationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/AdminCustomerCreationType.php @@ -1,17 +1,20 @@ add('product', PurchasableSelectionType::class); + ->add('product', PurchasableSelectionType::class) + ; } $builder diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartCreationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartCreationType.php index 989b8778db..d5939e54b7 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartCreationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartCreationType.php @@ -1,17 +1,20 @@ true, ]) ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { - }); + }) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemPriceRuleActionChoiceType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemPriceRuleActionChoiceType.php index 2d9f4c1857..74b586c2f5 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemPriceRuleActionChoiceType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemPriceRuleActionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemPriceRuleConditionChoiceType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemPriceRuleConditionChoiceType.php index 1d82cbf0b9..f91289bb73 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemPriceRuleConditionChoiceType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemPriceRuleConditionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemType.php index 8bdb2a6036..78cf9c3458 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartItemType.php @@ -1,17 +1,20 @@ getForm()->add('quantity', QuantityType::class, [ 'html5' => true, 'label' => 'coreshop.ui.quantity', - 'disabled' => (bool)$data->getIsGiftItem(), + 'disabled' => (bool) $data->getIsGiftItem(), ]); }); diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleActionChoiceType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleActionChoiceType.php index be65f847bb..1fadc4389a 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleActionChoiceType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleActionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleChoiceType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleChoiceType.php index f7f2b6dd57..f5857088d3 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleChoiceType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleChoiceType.php @@ -1,17 +1,20 @@ 'name', 'choice_translation_domain' => false, 'active' => true, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleConditionChoiceType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleConditionChoiceType.php index 1376eff4d0..12e923bb99 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleConditionChoiceType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleConditionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleTranslationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleTranslationType.php index 6d1fbabf29..7bc5a0231b 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleTranslationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleTranslationType.php @@ -1,17 +1,20 @@ add('label', TextType::class); + ->add('label', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleType.php index 53d4c061b9..1988e260fc 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartPriceRuleType.php @@ -1,17 +1,20 @@ add('active', CheckboxType::class) ->add('description', TextareaType::class) ->add('conditions', CartPriceRuleConditionCollectionType::class) - ->add('actions', CartPriceRuleActionCollectionType::class); + ->add('actions', CartPriceRuleActionCollectionType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartType.php index 458c0b4453..428c3d4650 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/CartType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/CartType.php @@ -1,17 +1,20 @@ false, 'label' => 'coreshop.form.cart.items', ]) - ->add('submit', SubmitType::class);; + ->add('submit', SubmitType::class) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/EditCartItemsCollectionType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/EditCartItemsCollectionType.php index 167a2ea392..66905a3558 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/EditCartItemsCollectionType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/EditCartItemsCollectionType.php @@ -1,17 +1,20 @@ add('items', EditCartItemsCollectionType::class); + ->add('items', EditCartItemsCollectionType::class) + ; } } diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderInvoiceCreationItemsType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderInvoiceCreationItemsType.php index 3b4f02095b..fd844ac40a 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderInvoiceCreationItemsType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderInvoiceCreationItemsType.php @@ -1,17 +1,20 @@ add('orderItemId', NumberType::class) - ->add('quantity', NumberType::class); + ->add('quantity', NumberType::class) + ; } } diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderInvoiceCreationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderInvoiceCreationType.php index 3f33bdf32a..75f0ca48aa 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderInvoiceCreationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderInvoiceCreationType.php @@ -1,17 +1,20 @@ true, 'by_reference' => false, 'error_bubbling' => false, - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderShipmentCreationItemsType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderShipmentCreationItemsType.php index 7940930275..d7f6f3a54d 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderShipmentCreationItemsType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderShipmentCreationItemsType.php @@ -1,17 +1,20 @@ add('orderItemId', NumberType::class) - ->add('quantity', NumberType::class); + ->add('quantity', NumberType::class) + ; } } diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderShipmentCreationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderShipmentCreationType.php index ed12a54542..fbb6b6b077 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderShipmentCreationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/OrderShipmentCreationType.php @@ -1,17 +1,20 @@ true, 'by_reference' => false, 'error_bubbling' => false, - ]); + ]) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/PurchasableSelectionType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/PurchasableSelectionType.php index c866541c1d..12facd6481 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/PurchasableSelectionType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/PurchasableSelectionType.php @@ -1,17 +1,20 @@ add('conditions', CartItemPriceRuleConditionCollectionType::class, [ 'constraints' => new Valid(['groups' => $this->conditionsValidationGroups]), 'nested' => true, - ]); + ]) + ; $builder ->add('actions', CartItemPriceRuleActionCollectionType::class, [ 'constraints' => new Valid(['groups' => $this->actionsValidationGroups]), 'nested' => true, - ]); + ]) + ; $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { $data = $event->getData(); diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/DiscountAmountConfigurationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/DiscountAmountConfigurationType.php index cebad93084..78d1bb9c6b 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/DiscountAmountConfigurationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/DiscountAmountConfigurationType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; $builder->get('currency')->addModelTransformer(new CallbackTransformer( function (mixed $currency) { @@ -73,7 +77,7 @@ function (mixed $currency) { } return null; - } + }, )); } diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/DiscountPercentConfigurationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/DiscountPercentConfigurationType.php index fe5128e2cc..e77fa2b307 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/DiscountPercentConfigurationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/DiscountPercentConfigurationType.php @@ -1,17 +1,20 @@ 'numeric', 'groups' => $this->validationGroups]), new Range(['min' => 0, 'max' => 100, 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/SurchargeAmountConfigurationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/SurchargeAmountConfigurationType.php index 07c90f01d6..c1bc86c7d0 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/SurchargeAmountConfigurationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/SurchargeAmountConfigurationType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; $builder->get('currency')->addModelTransformer(new CallbackTransformer( function (mixed $currency) { @@ -66,7 +70,7 @@ function (mixed $currency) { } return null; - } + }, )); } diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/SurchargePercentConfigurationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/SurchargePercentConfigurationType.php index 676af7a941..a65eb8ca9d 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/SurchargePercentConfigurationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Action/SurchargePercentConfigurationType.php @@ -1,17 +1,20 @@ 'numeric', 'groups' => $this->validationGroups]), new Range(['min' => 0, 'max' => 100, 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/AmountConfigurationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/AmountConfigurationType.php index bc35057304..c9c186efde 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/AmountConfigurationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/AmountConfigurationType.php @@ -1,17 +1,20 @@ $this->validationGroups]), new Type(['type' => 'numeric', 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/NestedConfigurationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/NestedConfigurationType.php index fed8f7518d..f099e0565c 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/NestedConfigurationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/NestedConfigurationType.php @@ -1,17 +1,20 @@ add('conditions', CartPriceRuleConditionCollectionType::class, [ 'constraints' => new Valid(['groups' => $this->validationGroups]), 'nested' => true, - ]); + ]) + ; $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { $data = $event->getData(); diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php index e93307732d..61318c03c3 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php @@ -1,17 +1,20 @@ add('maxUsagePerCode', NumberType::class) - ->add('onlyOnePerCart', CheckboxType::class); + ->add('onlyOnePerCart', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/ShippingCalculatorType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/ShippingCalculatorType.php index 37a1562b67..83f9acef8e 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/ShippingCalculatorType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/ShippingCalculatorType.php @@ -1,17 +1,20 @@ add('submit', SubmitType::class, [ 'label' => 'coreshop.form.cart.carrier.submit', - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/VoucherGeneratorType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/VoucherGeneratorType.php index d518e21973..baab994058 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/VoucherGeneratorType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/VoucherGeneratorType.php @@ -1,17 +1,20 @@ add('prefix', TextType::class) ->add('suffix', TextType::class) ->add('hyphensOn', IntegerType::class) - ->add('cartPriceRule', CartPriceRuleChoiceType::class); + ->add('cartPriceRule', CartPriceRuleChoiceType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Form/Type/VoucherType.php b/src/CoreShop/Bundle/OrderBundle/Form/Type/VoucherType.php index 0ae86f5ad8..3f304ead5f 100644 --- a/src/CoreShop/Bundle/OrderBundle/Form/Type/VoucherType.php +++ b/src/CoreShop/Bundle/OrderBundle/Form/Type/VoucherType.php @@ -1,17 +1,20 @@ add('code', TextType::class) - ->add('cartPriceRule', CartPriceRuleChoiceType::class); + ->add('cartPriceRule', CartPriceRuleChoiceType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/OrderBundle/Manager/CartManager.php b/src/CoreShop/Bundle/OrderBundle/Manager/CartManager.php index 10fff786f1..7cb972f4e9 100644 --- a/src/CoreShop/Bundle/OrderBundle/Manager/CartManager.php +++ b/src/CoreShop/Bundle/OrderBundle/Manager/CartManager.php @@ -1,17 +1,20 @@ setParent( $this->folderCreationService->createFolderForResource( $item, - ['prefix' => $cart->getFullPath()] - ) + ['prefix' => $cart->getFullPath()], + ), ); $item->setPublished(true); $item->setKey($index + 1); diff --git a/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/Factory/OrderStateFactory.php b/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/Factory/OrderStateFactory.php index 56ba348e54..eb83ff3990 100644 --- a/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/Factory/OrderStateFactory.php +++ b/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/Factory/OrderStateFactory.php @@ -1,17 +1,20 @@ highlightLabel = $config->highlightLabel; } @@ -114,9 +120,9 @@ private function getContrastColor(int $r, int $g, int $b): string 0.0722 * ((0 / 255) ** 2.2); if ($l1 > $l2) { - $contrastRatio = (int)(($l1 + 0.05) / ($l2 + 0.05)); + $contrastRatio = (int) (($l1 + 0.05) / ($l2 + 0.05)); } else { - $contrastRatio = (int)(($l2 + 0.05) / ($l1 + 0.05)); + $contrastRatio = (int) (($l2 + 0.05) / ($l1 + 0.05)); } if ($contrastRatio > 7) { diff --git a/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/PriceFormatter.php b/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/PriceFormatter.php index 1c37f24c4a..be860c1668 100644 --- a/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/PriceFormatter.php +++ b/src/CoreShop/Bundle/OrderBundle/Pimcore/GridColumnConfig/Operator/PriceFormatter.php @@ -1,17 +1,20 @@ findLatestCartByStoreAndCustomer($store, $customer); } diff --git a/src/CoreShop/Bundle/OrderBundle/Pimcore/Repository/OrderShipmentRepository.php b/src/CoreShop/Bundle/OrderBundle/Pimcore/Repository/OrderShipmentRepository.php index 7e759f3ddb..eeda8fa1f9 100644 --- a/src/CoreShop/Bundle/OrderBundle/Pimcore/Repository/OrderShipmentRepository.php +++ b/src/CoreShop/Bundle/OrderBundle/Pimcore/Repository/OrderShipmentRepository.php @@ -1,17 +1,20 @@ $orderDocument->getId(), 'order' => $orderDocument->getOrder(), 'document' => $orderDocument, - 'language' => (string)$orderDocument->getOrder()->getLocaleCode(), + 'language' => (string) $orderDocument->getOrder()->getLocaleCode(), 'type' => $orderDocument::getDocumentType(), $orderDocument::getDocumentType() => $orderDocument, ]; @@ -64,14 +71,14 @@ public function renderDocumentPdf(OrderDocumentInterface $orderDocument): string $this->eventDispatcher->dispatch( $event, - sprintf('coreshop.order.%s.wkhtml.options', $orderDocument::getDocumentType()) + sprintf('coreshop.order.%s.wkhtml.options', $orderDocument::getDocumentType()), ); return $this->renderer->fromString( $content ?: '', $contentHeader ?: '', $contentFooter ?: '', - ['options' => [$event->getOptions()]] + ['options' => [$event->getOptions()]], ); }); } diff --git a/src/CoreShop/Bundle/OrderBundle/Renderer/Pdf/PdfRendererInterface.php b/src/CoreShop/Bundle/OrderBundle/Renderer/Pdf/PdfRendererInterface.php index d32fef52e2..7f833c9820 100644 --- a/src/CoreShop/Bundle/OrderBundle/Renderer/Pdf/PdfRendererInterface.php +++ b/src/CoreShop/Bundle/OrderBundle/Renderer/Pdf/PdfRendererInterface.php @@ -1,17 +1,20 @@ countOrderInvoicesInState($order, $invoiceState); $invoiceAmount = count($this->orderInvoiceRepository->getDocumentsNotInState($order, OrderInvoiceStates::STATE_CANCELLED)); diff --git a/src/CoreShop/Bundle/OrderBundle/StateResolver/OrderPaymentStateResolver.php b/src/CoreShop/Bundle/OrderBundle/StateResolver/OrderPaymentStateResolver.php index 140d2dfb4d..0055f13528 100644 --- a/src/CoreShop/Bundle/OrderBundle/StateResolver/OrderPaymentStateResolver.php +++ b/src/CoreShop/Bundle/OrderBundle/StateResolver/OrderPaymentStateResolver.php @@ -1,17 +1,20 @@ countOrderShipmentsInState($order, $shipmentState); $shipmentAmount = count($this->orderShipmentRepository->getDocumentsNotInState($order, OrderShipmentStates::STATE_CANCELLED)); diff --git a/src/CoreShop/Bundle/OrderBundle/StateResolver/OrderStateResolver.php b/src/CoreShop/Bundle/OrderBundle/StateResolver/OrderStateResolver.php index 20f261ff3c..73fb9bc300 100644 --- a/src/CoreShop/Bundle/OrderBundle/StateResolver/OrderStateResolver.php +++ b/src/CoreShop/Bundle/OrderBundle/StateResolver/OrderStateResolver.php @@ -1,17 +1,20 @@ ruleValidationProcessor->isValidCartRule($value, $cartRule, $voucherCode)) { $this->context->addViolation( $constraint->message, - ['%rule%' => $cartRule->getName()] + ['%rule%' => $cartRule->getName()], ); } } diff --git a/src/CoreShop/Bundle/OrderBundle/Validator/Constraints/VoucherAmount.php b/src/CoreShop/Bundle/OrderBundle/Validator/Constraints/VoucherAmount.php index c8e616388c..a13f95c545 100644 --- a/src/CoreShop/Bundle/OrderBundle/Validator/Constraints/VoucherAmount.php +++ b/src/CoreShop/Bundle/OrderBundle/Validator/Constraints/VoucherAmount.php @@ -1,17 +1,20 @@ $value->getAmount(), '%codeLength%' => $value->getLength(), '%possibleAmount%' => $this->checker->getPossibleGenerationAmount($value), - ] + ], ); } } diff --git a/src/CoreShop/Bundle/PaymentBundle/CoreExtension/PaymentProvider.php b/src/CoreShop/Bundle/PaymentBundle/CoreExtension/PaymentProvider.php index 43c502a232..6700c294c6 100644 --- a/src/CoreShop/Bundle/PaymentBundle/CoreExtension/PaymentProvider.php +++ b/src/CoreShop/Bundle/PaymentBundle/CoreExtension/PaymentProvider.php @@ -1,17 +1,20 @@ children() ->scalarNode('driver')->defaultValue(CoreShopResourceBundle::DRIVER_DOCTRINE_ORM)->end() - ->end(); + ->end() + ; $this->addModelsSection($rootNode); $this->addPimcoreResourcesSection($rootNode); @@ -109,7 +113,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -140,6 +145,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/PaymentBundle/DependencyInjection/CoreShopPaymentExtension.php b/src/CoreShop/Bundle/PaymentBundle/DependencyInjection/CoreShopPaymentExtension.php index 03c7d468ee..3724dde012 100644 --- a/src/CoreShop/Bundle/PaymentBundle/DependencyInjection/CoreShopPaymentExtension.php +++ b/src/CoreShop/Bundle/PaymentBundle/DependencyInjection/CoreShopPaymentExtension.php @@ -1,17 +1,20 @@ setParameter('locale', $locale) ->addOrderBy('o.position') ->getQuery() - ->getResult(); + ->getResult() + ; } public function findActive(): array @@ -38,6 +42,7 @@ public function findActive(): array ->andWhere('o.active = true') ->addOrderBy('o.position') ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentRepository.php b/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentRepository.php index fa9e959bfd..fb09a77de3 100644 --- a/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentRepository.php +++ b/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentRepository.php @@ -1,17 +1,20 @@ setParameter('orderId', $payable->getId()) ->orderBy('o.id', 'DESC') ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderChoiceType.php b/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderChoiceType.php index 1928db4134..8e903db326 100644 --- a/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderChoiceType.php +++ b/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderChoiceType.php @@ -1,17 +1,20 @@ false, 'active' => true, 'subject' => null, - ]); + ]) + ; } public function buildView(FormView $view, FormInterface $form, array $options): void diff --git a/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderTranslationType.php b/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderTranslationType.php index b544bbfb25..f59c4791cf 100644 --- a/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderTranslationType.php +++ b/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderTranslationType.php @@ -1,17 +1,20 @@ add('instructions', TextareaType::class, [ 'required' => false, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderType.php b/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderType.php index d66777a42d..4a4b3ed36c 100644 --- a/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderType.php +++ b/src/CoreShop/Bundle/PaymentBundle/Form/Type/PaymentProviderType.php @@ -1,17 +1,20 @@ add('active', CheckboxType::class, [ 'required' => false, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/PaymentBundle/Resources/public/pimcore/css/payment.css b/src/CoreShop/Bundle/PaymentBundle/Resources/public/pimcore/css/payment.css index fb0d4ed5bd..48ec53593e 100644 --- a/src/CoreShop/Bundle/PaymentBundle/Resources/public/pimcore/css/payment.css +++ b/src/CoreShop/Bundle/PaymentBundle/Resources/public/pimcore/css/payment.css @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ .pimcore_icon_coreShopPaymentProvider, diff --git a/src/CoreShop/Bundle/PayumBundle/Action/AuthorizePaymentAction.php b/src/CoreShop/Bundle/PayumBundle/Action/AuthorizePaymentAction.php index a60f19b75a..a81accd20e 100644 --- a/src/CoreShop/Bundle/PayumBundle/Action/AuthorizePaymentAction.php +++ b/src/CoreShop/Bundle/PayumBundle/Action/AuthorizePaymentAction.php @@ -1,17 +1,20 @@ setModel($details); $this->gateway->execute($request); } finally { - $payment->setDetails((array)$details); + $payment->setDetails((array) $details); } } diff --git a/src/CoreShop/Bundle/PayumBundle/Action/CapturePaymentAction.php b/src/CoreShop/Bundle/PayumBundle/Action/CapturePaymentAction.php index 416d207fe6..644f668491 100644 --- a/src/CoreShop/Bundle/PayumBundle/Action/CapturePaymentAction.php +++ b/src/CoreShop/Bundle/PayumBundle/Action/CapturePaymentAction.php @@ -1,17 +1,20 @@ setModel($details); $this->gateway->execute($request); } finally { - $payment->setDetails((array)$details); + $payment->setDetails((array) $details); } } diff --git a/src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php b/src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php index 2cba2dd771..a1f68b4570 100644 --- a/src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php +++ b/src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php @@ -1,17 +1,20 @@ gateway->execute($request); } finally { - $payment->setDetails((array)$details); + $payment->setDetails((array) $details); } } diff --git a/src/CoreShop/Bundle/PayumBundle/Action/Offline/ConfirmOrderAction.php b/src/CoreShop/Bundle/PayumBundle/Action/Offline/ConfirmOrderAction.php index b5af73af4c..eb80156be8 100644 --- a/src/CoreShop/Bundle/PayumBundle/Action/Offline/ConfirmOrderAction.php +++ b/src/CoreShop/Bundle/PayumBundle/Action/Offline/ConfirmOrderAction.php @@ -1,17 +1,20 @@ getCustomer()) { $details['EMAIL'] = $customer->getEmail(); } - + $invoiceAddress = $order->getInvoiceAddress(); if ($invoiceAddress) { @@ -113,7 +118,6 @@ private function prepareAddressData(OrderInterface $order, array $details): arra $details['PAYMENTREQUEST_0_SHIPTOCITY'] = $invoiceAddress->getCity(); $details['PAYMENTREQUEST_0_SHIPTOZIP'] = $invoiceAddress->getPostcode(); - if ($invoiceAddress->getPhoneNumber() !== null) { $details['PAYMENTREQUEST_0_SHIPTOPHONENUM'] = $invoiceAddress->getPhoneNumber(); } diff --git a/src/CoreShop/Bundle/PayumBundle/Action/ResolveNextRouteAction.php b/src/CoreShop/Bundle/PayumBundle/Action/ResolveNextRouteAction.php index a687b38826..3a9dd2f015 100644 --- a/src/CoreShop/Bundle/PayumBundle/Action/ResolveNextRouteAction.php +++ b/src/CoreShop/Bundle/PayumBundle/Action/ResolveNextRouteAction.php @@ -1,17 +1,20 @@ getGatewayName(), $payment, 'coreshop_payment_after', - [] + [], ); } else { $token = $this->getPayum()->getTokenFactory()->createCaptureToken( $gatewayConfig->getGatewayName(), $payment, 'coreshop_payment_after', - [] + [], ); } diff --git a/src/CoreShop/Bundle/PayumBundle/CoreGatewayFactory.php b/src/CoreShop/Bundle/PayumBundle/CoreGatewayFactory.php index a69c76db56..bf6f46b839 100644 --- a/src/CoreShop/Bundle/PayumBundle/CoreGatewayFactory.php +++ b/src/CoreShop/Bundle/PayumBundle/CoreGatewayFactory.php @@ -1,17 +1,20 @@ scalarNode('obtain_credit_card')->defaultValue('@CoreShopPayum/Action/obtainCreditCard.html.twig')->end() ->end() ->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/PayumBundle/DependencyInjection/CoreShopPayumExtension.php b/src/CoreShop/Bundle/PayumBundle/DependencyInjection/CoreShopPayumExtension.php index 72b02dec95..18308536e4 100644 --- a/src/CoreShop/Bundle/PayumBundle/DependencyInjection/CoreShopPayumExtension.php +++ b/src/CoreShop/Bundle/PayumBundle/DependencyInjection/CoreShopPayumExtension.php @@ -1,17 +1,20 @@ getPrevious(); /** * @var int + * * @psalm-type int */ $previousStackSize = count($previousStack); diff --git a/src/CoreShop/Bundle/PayumBundle/Extension/UpdatePaymentStateExtension.php b/src/CoreShop/Bundle/PayumBundle/Extension/UpdatePaymentStateExtension.php index a03dd77272..92f995f844 100644 --- a/src/CoreShop/Bundle/PayumBundle/Extension/UpdatePaymentStateExtension.php +++ b/src/CoreShop/Bundle/PayumBundle/Extension/UpdatePaymentStateExtension.php @@ -1,17 +1,20 @@ getPrevious(); /** * @var int + * * @psalm-type int */ $previousStackSize = count($previousStack); diff --git a/src/CoreShop/Bundle/PayumBundle/Factory/ConfirmOrderFactory.php b/src/CoreShop/Bundle/PayumBundle/Factory/ConfirmOrderFactory.php index 8a3553dd4b..f0f625a5cc 100644 --- a/src/CoreShop/Bundle/PayumBundle/Factory/ConfirmOrderFactory.php +++ b/src/CoreShop/Bundle/PayumBundle/Factory/ConfirmOrderFactory.php @@ -1,17 +1,20 @@ getData(); $data['payum.http_client'] = '@coreshop.payum.http_client'; - }); + }) + ; } } diff --git a/src/CoreShop/Bundle/PayumBundle/Form/Type/SofortGatewayConfigurationType.php b/src/CoreShop/Bundle/PayumBundle/Form/Type/SofortGatewayConfigurationType.php index 1bc0950f9a..b9c2a46728 100644 --- a/src/CoreShop/Bundle/PayumBundle/Form/Type/SofortGatewayConfigurationType.php +++ b/src/CoreShop/Bundle/PayumBundle/Form/Type/SofortGatewayConfigurationType.php @@ -1,17 +1,20 @@ getData(); $data['payum.http_client'] = '@coreshop.payum.http_client'; - }); + }) + ; } } diff --git a/src/CoreShop/Bundle/PayumBundle/Request/ConfirmOrder.php b/src/CoreShop/Bundle/PayumBundle/Request/ConfirmOrder.php index 2494c3c42c..cda4194ab9 100644 --- a/src/CoreShop/Bundle/PayumBundle/Request/ConfirmOrder.php +++ b/src/CoreShop/Bundle/PayumBundle/Request/ConfirmOrder.php @@ -1,17 +1,20 @@ true, 'factories' => $factoryResults, - ] + ], ); } } diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/CoreShopPayumPaymentBundle.php b/src/CoreShop/Bundle/PayumPaymentBundle/CoreShopPayumPaymentBundle.php index 3c654249a6..9b5b8ca08e 100644 --- a/src/CoreShop/Bundle/PayumPaymentBundle/CoreShopPayumPaymentBundle.php +++ b/src/CoreShop/Bundle/PayumPaymentBundle/CoreShopPayumPaymentBundle.php @@ -1,17 +1,20 @@ addMethodCall( 'add', - ['gateway_config', $tags['type'], $container->getDefinition($id)->getClass()] + ['gateway_config', $tags['type'], $container->getDefinition($id)->getClass()], ); } } diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/Compiler/RegisterPaymentSettingsFormsPass.php b/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/Compiler/RegisterPaymentSettingsFormsPass.php index c254dcfa67..97e9a6ed25 100644 --- a/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/Compiler/RegisterPaymentSettingsFormsPass.php +++ b/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/Compiler/RegisterPaymentSettingsFormsPass.php @@ -1,17 +1,20 @@ addMethodCall('add', [$payumFactory, 'default', $container->getDefinition($id)->getClass()]); + ->addMethodCall('add', [$payumFactory, 'default', $container->getDefinition($id)->getClass()]) + ; } } } diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/Configuration.php b/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/Configuration.php index 2ec8767169..a6d800d78c 100644 --- a/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/Configuration.php +++ b/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/Configuration.php @@ -1,17 +1,20 @@ children() ->scalarNode('driver')->defaultValue(CoreShopResourceBundle::DRIVER_DOCTRINE_ORM)->end() - ->end(); + ->end() + ; $this->addResourcesSection($rootNode); @@ -78,6 +82,7 @@ private function addResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/CoreShopPayumPaymentExtension.php b/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/CoreShopPayumPaymentExtension.php index 9bcb650cec..cd29a1a292 100644 --- a/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/CoreShopPayumPaymentExtension.php +++ b/src/CoreShop/Bundle/PayumPaymentBundle/DependencyInjection/CoreShopPayumPaymentExtension.php @@ -1,17 +1,20 @@ $val->getGatewayConfig()->getFactoryName()]; }, - ]); + ]) + ; } public static function getExtendedTypes(): array diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/Form/Extension/PaymentProviderTypeExtension.php b/src/CoreShop/Bundle/PayumPaymentBundle/Form/Extension/PaymentProviderTypeExtension.php index d6bc065e0e..e1cb3b3cff 100644 --- a/src/CoreShop/Bundle/PayumPaymentBundle/Form/Extension/PaymentProviderTypeExtension.php +++ b/src/CoreShop/Bundle/PayumPaymentBundle/Form/Extension/PaymentProviderTypeExtension.php @@ -1,17 +1,20 @@ getGatewayName()) { $gatewayConfig->setGatewayName($paymentMethod->getIdentifier()); } - }); + }) + ; } public function getExtendedType(): string diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/Form/Type/GatewayConfigType.php b/src/CoreShop/Bundle/PayumPaymentBundle/Form/Type/GatewayConfigType.php index 205a79d2c7..019ea5b3a2 100644 --- a/src/CoreShop/Bundle/PayumPaymentBundle/Form/Type/GatewayConfigType.php +++ b/src/CoreShop/Bundle/PayumPaymentBundle/Form/Type/GatewayConfigType.php @@ -1,17 +1,20 @@ getForm()->add('config', $configType, [ 'auto_initialize' => false, ]); - }); + }) + ; } } diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/Resolver/EventBasedPaymentProviderResolver.php b/src/CoreShop/Bundle/PayumPaymentBundle/Resolver/EventBasedPaymentProviderResolver.php index f1fe9db4a3..45cefe333b 100644 --- a/src/CoreShop/Bundle/PayumPaymentBundle/Resolver/EventBasedPaymentProviderResolver.php +++ b/src/CoreShop/Bundle/PayumPaymentBundle/Resolver/EventBasedPaymentProviderResolver.php @@ -1,17 +1,20 @@ %command.name% executes all CoreShop migrations. EOT - ); + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/PimcoreBundle/Command/AppMigrationGenerateCommand.php b/src/CoreShop/Bundle/PimcoreBundle/Command/AppMigrationGenerateCommand.php index c95fa22e45..fcaf95e86f 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Command/AppMigrationGenerateCommand.php +++ b/src/CoreShop/Bundle/PimcoreBundle/Command/AppMigrationGenerateCommand.php @@ -1,17 +1,20 @@ setName('coreshop:app:migration:generate') - ->setDescription('Create a new App migration.'); + ->setDescription('Create a new App migration.') + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/DynamicDropdownController.php b/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/DynamicDropdownController.php index df65acdcaa..de8891942c 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/DynamicDropdownController.php +++ b/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/DynamicDropdownController.php @@ -1,17 +1,20 @@ query->get('folderName'); + $folderName = (string) $request->query->get('folderName'); $parts = array_map(static function (string $part) { return Service::getValidKey($part, 'object'); }, preg_split('/\//', $folderName, 0, \PREG_SPLIT_NO_EMPTY)); $parentFolderPath = sprintf('/%s', implode('/', $parts)); - $sort = (string)$request->query->get('sortBy', ''); + $sort = (string) $request->query->get('sortBy', ''); $options = []; if ($parentFolderPath) { @@ -54,7 +57,7 @@ public function optionsAction(Request $request): JsonResponse 'success' => false, 'message' => $message, 'options' => $options, - ] + ], ); } @@ -72,14 +75,14 @@ static function (array $a, array $b) use ($sort) { } return $a[$field] < $b[$field] ? 0 : 1; - } + }, ); return $this->json( [ 'success' => true, 'options' => $options, - ] + ], ); } @@ -87,7 +90,7 @@ public function methodsAction(Request $request, Factory $modelFactory): JsonResp { $availableMethods = []; - $className = preg_replace("@[^a-zA-Z0-9_\-]@", '', (string)$request->query->get('className')); + $className = preg_replace("@[^a-zA-Z0-9_\-]@", '', (string) $request->query->get('className')); if (!empty($className)) { /** @@ -119,8 +122,8 @@ public function methodsAction(Request $request, Factory $modelFactory): JsonResp private function walkPath(Request $request, DataObject\AbstractObject $folder, array $options = [], string $path = ''): array { $currentLang = $request->query->get('current_language'); - $source = (string)$request->query->get('methodName'); - $className = preg_replace("@[^a-zA-Z0-9_\-]@", '', (string)$request->query->get('className')); + $source = (string) $request->query->get('methodName'); + $className = preg_replace("@[^a-zA-Z0-9_\-]@", '', (string) $request->query->get('className')); if (empty($className)) { throw new \InvalidArgumentException(); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/GridController.php b/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/GridController.php index 7061ed3c7b..f90351ddb5 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/GridController.php +++ b/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/GridController.php @@ -1,17 +1,20 @@ request->get('ids'); - $actionId = (string)$request->request->get('actionId'); + $actionId = (string) $request->request->get('actionId'); if (is_string($requestedIds)) { $requestedIds = json_decode($requestedIds); diff --git a/src/CoreShop/Bundle/PimcoreBundle/CoreExtension/DynamicDropdown.php b/src/CoreShop/Bundle/PimcoreBundle/CoreExtension/DynamicDropdown.php index 4127b751c1..e4f6876299 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/CoreExtension/DynamicDropdown.php +++ b/src/CoreShop/Bundle/PimcoreBundle/CoreExtension/DynamicDropdown.php @@ -1,17 +1,20 @@ $fieldDefinition->getName(), 'type' => $this->getFieldType($fieldDefinition, $class, $container), ], - $container + $container, ); } public function getFieldType(Data $fieldDefinition, $class = null, $container = null) { - if (!$this->instance instanceof SerializedDataType){ + if (!$this->instance instanceof SerializedDataType) { $this->instance = new SerializedDataType(); + return $this->instance; } + return $this->instance; } } diff --git a/src/CoreShop/Bundle/PimcoreBundle/DataHub/Type/SerializedDataType.php b/src/CoreShop/Bundle/PimcoreBundle/DataHub/Type/SerializedDataType.php index 4d57437bba..6bfc844f3e 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/DataHub/Type/SerializedDataType.php +++ b/src/CoreShop/Bundle/PimcoreBundle/DataHub/Type/SerializedDataType.php @@ -1,17 +1,20 @@ registerAliasForArgument( @@ -68,8 +71,8 @@ public function process(ContainerBuilder $container): void strtolower(trim(preg_replace( ['/([A-Z])/', '/[_\s]+/'], ['_$1', ' '], - $tag['type_hint'] - ))) . 'Registry' + $tag['type_hint'], + ))) . 'Registry', ); } } diff --git a/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/Configuration.php b/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/Configuration.php index 018c8cf1d2..9ddc399d97 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/Configuration.php +++ b/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/Configuration.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/CoreShopPimcoreExtension.php b/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/CoreShopPimcoreExtension.php index a01a6c512d..4a93ebd7d5 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/CoreShopPimcoreExtension.php +++ b/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/CoreShopPimcoreExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(GridActionInterface::class) - ->addTag(RegisterGridActionPass::GRID_ACTION_TAG); + ->addTag(RegisterGridActionPass::GRID_ACTION_TAG) + ; $container ->registerForAutoconfiguration(GridFilterInterface::class) - ->addTag(RegisterGridFilterPass::GRID_FILTER_TAG); + ->addTag(RegisterGridFilterPass::GRID_FILTER_TAG) + ; } } diff --git a/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/Extension/AbstractPimcoreExtension.php b/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/Extension/AbstractPimcoreExtension.php index ae9131a392..3912f65b45 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/Extension/AbstractPimcoreExtension.php +++ b/src/CoreShop/Bundle/PimcoreBundle/DependencyInjection/Extension/AbstractPimcoreExtension.php @@ -1,17 +1,20 @@ params = $params; } diff --git a/src/CoreShop/Bundle/PimcoreBundle/EventListener/AdminJavascriptListener.php b/src/CoreShop/Bundle/PimcoreBundle/EventListener/AdminJavascriptListener.php index 66bea8d5b5..fa8f29a896 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/EventListener/AdminJavascriptListener.php +++ b/src/CoreShop/Bundle/PimcoreBundle/EventListener/AdminJavascriptListener.php @@ -1,17 +1,20 @@ slugger->slug($object, $language, (string)$i); - $i++; + $slug = $this->slugger->slug($object, $language, (string) $i); + ++$i; } $newSlugs[] = new UrlSlug($slug, 0); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Events.php b/src/CoreShop/Bundle/PimcoreBundle/Events.php index 2a5bc42063..4966508b70 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Events.php +++ b/src/CoreShop/Bundle/PimcoreBundle/Events.php @@ -1,17 +1,20 @@ eventDispatcher->dispatch($mailEvent, Events::PRE_MAIL_SEND); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/css/pimcore.css b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/css/pimcore.css index fef3a50f0b..1bb4fc5c9c 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/css/pimcore.css +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/css/pimcore.css @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ .coreshop_icon_serialized, diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopDynamicDropdown.js b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopDynamicDropdown.js index 6692f44e4b..3e5f3b0aea 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopDynamicDropdown.js +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopDynamicDropdown.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.classes.data.coreShopDynamicDropdown'); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopDynamicDropdownMultiple.js b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopDynamicDropdownMultiple.js index 8b81b284d9..a2f7c448c8 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopDynamicDropdownMultiple.js +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopDynamicDropdownMultiple.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.classes.data.coreShopDynamicDropdownMultiple'); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopItemSelector.js b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopItemSelector.js index 5663061c87..bf2c747a51 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopItemSelector.js +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopItemSelector.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.classes.data.coreShopItemSelector'); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopSuperBoxSelect.js b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopSuperBoxSelect.js index f81801728b..b47b1426bb 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopSuperBoxSelect.js +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/data/coreShopSuperBoxSelect.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.classes.data.coreShopSuperBoxSelect'); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopDynamicDropdown.js b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopDynamicDropdown.js index da026cb147..de764cddc1 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopDynamicDropdown.js +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopDynamicDropdown.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.tags.coreShopDynamicDropdown'); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopDynamicDropdownMultiple.js b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopDynamicDropdownMultiple.js index d28bd6ec3e..4fb99edca3 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopDynamicDropdownMultiple.js +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopDynamicDropdownMultiple.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.tags.coreShopDynamicDropdownMultiple'); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopItemSelector.js b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopItemSelector.js index be565238f5..6e80637f0b 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopItemSelector.js +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopItemSelector.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.tags.coreShopItemSelector'); diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopSuperBoxSelect.js b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopSuperBoxSelect.js index 09a063b3f5..c18426ead0 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopSuperBoxSelect.js +++ b/src/CoreShop/Bundle/PimcoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopSuperBoxSelect.js @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ pimcore.registerNS('pimcore.object.tags.coreShopSuperBoxSelect'); diff --git a/src/CoreShop/Bundle/ProductBundle/Controller/ProductPriceRuleController.php b/src/CoreShop/Bundle/ProductBundle/Controller/ProductPriceRuleController.php index 2fa8ef7ccd..a42b8bbc28 100644 --- a/src/CoreShop/Bundle/ProductBundle/Controller/ProductPriceRuleController.php +++ b/src/CoreShop/Bundle/ProductBundle/Controller/ProductPriceRuleController.php @@ -1,17 +1,20 @@ get('coreshop.repository.stack.product'); /** @var ProductInterface $product */ - $product = $repository->find($this->getParameterFromRequest($request,'productId')); + $product = $repository->find($this->getParameterFromRequest($request, 'productId')); if ($product instanceof Concrete) { $product = VersionHelper::getLatestVersion($product); diff --git a/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductSpecificPriceRules.php b/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductSpecificPriceRules.php index 9f3d7381fd..67c1343f9b 100644 --- a/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductSpecificPriceRules.php +++ b/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductSpecificPriceRules.php @@ -1,17 +1,20 @@ arrayCastRecursive($value); } if ($value instanceof \stdClass) { - $array[$key] = $this->arrayCastRecursive((array)$value); + $array[$key] = $this->arrayCastRecursive((array) $value); } } } if ($array instanceof \stdClass) { - return $this->arrayCastRecursive((array)$array); + return $this->arrayCastRecursive((array) $array); } return $array; diff --git a/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnit.php b/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnit.php index f58194333d..13ee12faea 100644 --- a/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnit.php +++ b/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnit.php @@ -1,17 +1,20 @@ getDataFromResource($data, $object, $params); } } @@ -137,7 +140,7 @@ public function getDataForResource($data, $object = null, $params = []) public function getDataFromResource($data, $object = null, $params = []) { - if ((int)$data > 0) { + if ((int) $data > 0) { return $this->getRepository()->find($data); } diff --git a/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnitDefinitions.php b/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnitDefinitions.php index 0b9063a6ca..5a1c0eb940 100644 --- a/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnitDefinitions.php +++ b/src/CoreShop/Bundle/ProductBundle/CoreExtension/ProductUnitDefinitions.php @@ -1,17 +1,20 @@ 0) { + if (strlen((string) $defaultValue) > 0) { $this->defaultValue = $defaultValue; } @@ -453,7 +456,7 @@ public function getVersionPreview($data, $object = null, $params = []) return sprintf( 'Default Unit: %s, additional units: %d', $defaultUnit, - $data->getAdditionalUnitDefinitions()->count() + $data->getAdditionalUnitDefinitions()->count(), ); } @@ -480,7 +483,7 @@ public function getFromCsvImport($importValue, $object = null, $params = []) throw new \InvalidArgumentException(sprintf( 'Error decoding Product Unit Definitions JSON `%s`: %s', $importValue, - json_last_error_msg() + json_last_error_msg(), )); } @@ -502,11 +505,11 @@ public function getDiffDataForEditMode($data, $object = null, $params = []) */ protected function toNumeric($value): float|int { - if (!str_contains((string)$value, '.')) { - return (int)$value; + if (!str_contains((string) $value, '.')) { + return (int) $value; } - return (float)$value; + return (float) $value; } /** @@ -518,7 +521,7 @@ protected function expandDotNotationKeys(array $array) while (count($array)) { $value = reset($array); - $key = (string)key($array); + $key = (string) key($array); unset($array[$key]); if (str_contains($key, '.')) { diff --git a/src/CoreShop/Bundle/ProductBundle/CoreShopProductBundle.php b/src/CoreShop/Bundle/ProductBundle/CoreShopProductBundle.php index 6dd546950b..6d9548f17f 100644 --- a/src/CoreShop/Bundle/ProductBundle/CoreShopProductBundle.php +++ b/src/CoreShop/Bundle/ProductBundle/CoreShopProductBundle.php @@ -1,17 +1,20 @@ scalarNode('manufacturer')->defaultValue(ManufacturerInterface::class)->cannotBeEmpty()->end() ->end() ->end() - ->end(); + ->end() + ; } private function addModelsSection(ArrayNodeDefinition $node): void @@ -302,7 +306,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -333,6 +338,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/ProductBundle/DependencyInjection/CoreShopProductExtension.php b/src/CoreShop/Bundle/ProductBundle/DependencyInjection/CoreShopProductExtension.php index 16a0d5d7ad..e06fef7bda 100644 --- a/src/CoreShop/Bundle/ProductBundle/DependencyInjection/CoreShopProductExtension.php +++ b/src/CoreShop/Bundle/ProductBundle/DependencyInjection/CoreShopProductExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(ProductDiscountCalculatorInterface::class) - ->addTag(ProductDiscountCalculatorsPass::PRODUCT_DISCOUNT_CALCULATOR_TAG); + ->addTag(ProductDiscountCalculatorsPass::PRODUCT_DISCOUNT_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(ProductDiscountPriceCalculatorInterface::class) - ->addTag(ProductDiscountPriceCalculatorsPass::PRODUCT_DISCOUNT_PRICE_CALCULATOR_TAG); + ->addTag(ProductDiscountPriceCalculatorsPass::PRODUCT_DISCOUNT_PRICE_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(ProductPriceCalculatorInterface::class) - ->addTag(ProductRetailPriceCalculatorsPass::PRODUCT_RETAIL_PRICE_CALCULATOR_TAG); + ->addTag(ProductRetailPriceCalculatorsPass::PRODUCT_RETAIL_PRICE_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(ProductRetailPriceCalculatorInterface::class) - ->addTag(ProductRetailPriceCalculatorsPass::PRODUCT_RETAIL_PRICE_CALCULATOR_TAG); + ->addTag(ProductRetailPriceCalculatorsPass::PRODUCT_RETAIL_PRICE_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(ProductActionProcessorInterface::class) - ->addTag(ProductPriceRuleActionPass::PRODUCT_PRICE_RULE_ACTION_TAG); + ->addTag(ProductPriceRuleActionPass::PRODUCT_PRICE_RULE_ACTION_TAG) + ; $container ->registerForAutoconfiguration(ProductConditionCheckerInterface::class) - ->addTag(ProductPriceRuleConditionPass::PRODUCT_PRICE_RULE_CONDITION_TAG); + ->addTag(ProductPriceRuleConditionPass::PRODUCT_PRICE_RULE_CONDITION_TAG) + ; $container ->registerForAutoconfiguration(ProductSpecificActionProcessorInterface::class) - ->addTag(ProductSpecificPriceRuleActionPass::PRODUCT_SPECIFIC_PRICE_RULE_ACTION_TAG); + ->addTag(ProductSpecificPriceRuleActionPass::PRODUCT_SPECIFIC_PRICE_RULE_ACTION_TAG) + ; $container ->registerForAutoconfiguration(ProductSpecificConditionCheckerInterface::class) - ->addTag(ProductSpecificPriceRuleConditionPass::PRODUCT_SPECIFIC_PRICE_RULE_CONDITION_TAG); + ->addTag(ProductSpecificPriceRuleConditionPass::PRODUCT_SPECIFIC_PRICE_RULE_CONDITION_TAG) + ; } } diff --git a/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/PriceRuleRepository.php b/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/PriceRuleRepository.php index 747ddd7499..8a9d15d328 100644 --- a/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/PriceRuleRepository.php +++ b/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/PriceRuleRepository.php @@ -1,17 +1,20 @@ andWhere('o.active = 1') ->addOrderBy('o.priority', 'ASC') ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductPriceRuleRepository.php b/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductPriceRuleRepository.php index f87fc9e499..41fe2e6ae6 100644 --- a/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductPriceRuleRepository.php +++ b/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductPriceRuleRepository.php @@ -1,17 +1,20 @@ setParameter('productId', $product->getId()) ->addOrderBy('o.priority', 'ASC') ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitDefinitionsRepository.php b/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitDefinitionsRepository.php index 28c2a4c442..e4fbb73a55 100644 --- a/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitDefinitionsRepository.php +++ b/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitDefinitionsRepository.php @@ -1,17 +1,20 @@ andWhere('o.product = :product') ->setParameter('product', $product->getId()) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitRepository.php b/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitRepository.php index 0731f599fd..12f6c50698 100644 --- a/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitRepository.php +++ b/src/CoreShop/Bundle/ProductBundle/Doctrine/ORM/ProductUnitRepository.php @@ -1,17 +1,20 @@ andWhere('o.name = :name') ->setParameter('name', $name) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/ProductBundle/EventListener/CategoryPersistEventListener.php b/src/CoreShop/Bundle/ProductBundle/EventListener/CategoryPersistEventListener.php index 03f06b1bce..c1b5150f16 100644 --- a/src/CoreShop/Bundle/ProductBundle/EventListener/CategoryPersistEventListener.php +++ b/src/CoreShop/Bundle/ProductBundle/EventListener/CategoryPersistEventListener.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleConditionChoiceType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleConditionChoiceType.php index 27d4a5af35..7f90e84660 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleConditionChoiceType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleConditionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleTranslationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleTranslationType.php index b181589f14..d1618c3bba 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleTranslationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleTranslationType.php @@ -1,17 +1,20 @@ add('label', TextType::class); + ->add('label', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleType.php index 8233d1972e..4a317188ce 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductPriceRuleType.php @@ -1,17 +1,20 @@ add('active', CheckboxType::class) ->add('stopPropagation', CheckboxType::class) ->add('conditions', ProductPriceRuleConditionCollectionType::class) - ->add('actions', ProductPriceRuleActionCollectionType::class); + ->add('actions', ProductPriceRuleActionCollectionType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSelectionType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSelectionType.php index f8d5f3d441..a980eb46c1 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSelectionType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSelectionType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleConditionChoiceType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleConditionChoiceType.php index 427a129adf..bf1c1c9eb0 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleConditionChoiceType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleConditionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleTranslationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleTranslationType.php index 937885c062..f3afd8a875 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleTranslationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleTranslationType.php @@ -1,17 +1,20 @@ add('label', TextType::class); + ->add('label', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleType.php index 818b2e0524..0ef8c7fa0c 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/ProductSpecificPriceRuleType.php @@ -1,17 +1,20 @@ add('stopPropagation', CheckboxType::class) ->add('priority', IntegerType::class) ->add('conditions', ProductSpecificPriceRuleConditionCollectionType::class) - ->add('actions', ProductSpecificPriceRuleActionCollectionType::class); + ->add('actions', ProductSpecificPriceRuleActionCollectionType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/DiscountAmountConfigurationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/DiscountAmountConfigurationType.php index 5c3be0c2c7..1f7d06a31a 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/DiscountAmountConfigurationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/DiscountAmountConfigurationType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; $builder->get('currency')->addModelTransformer(new CallbackTransformer( function (mixed $currency) { @@ -63,7 +67,7 @@ function (mixed $currency) { } return null; - } + }, )); } diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/DiscountPercentConfigurationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/DiscountPercentConfigurationType.php index ba2cd4e624..ad35922afd 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/DiscountPercentConfigurationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/DiscountPercentConfigurationType.php @@ -1,17 +1,20 @@ 'numeric', 'groups' => $this->validationGroups]), new Range(['min' => 0, 'max' => 100, 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/PriceConfigurationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/PriceConfigurationType.php index b4562e3162..27696f0e6c 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/PriceConfigurationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Action/PriceConfigurationType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; $builder->get('currency')->addModelTransformer(new CallbackTransformer( function (mixed $currency) { @@ -61,7 +65,7 @@ function (mixed $currency) { } return null; - } + }, )); } diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/ProductPriceNestedConfigurationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/ProductPriceNestedConfigurationType.php index a07ad23d0d..4ec3ee7880 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/ProductPriceNestedConfigurationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/ProductPriceNestedConfigurationType.php @@ -1,17 +1,20 @@ add('conditions', ProductPriceRuleConditionCollectionType::class, [ 'constraints' => new Valid(['groups' => $this->validationGroups]), 'nested' => true, - ]); + ]) + ; $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { $data = $event->getData(); diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/ProductSpecificPriceNestedConfigurationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/ProductSpecificPriceNestedConfigurationType.php index 665438dd8e..03e2cf4c5f 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/ProductSpecificPriceNestedConfigurationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/ProductSpecificPriceNestedConfigurationType.php @@ -1,17 +1,20 @@ add('conditions', ProductSpecificPriceRuleConditionCollectionType::class, [ 'constraints' => [new Valid(['groups' => $this->validationGroups])], 'nested' => true, - ]); + ]) + ; $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { $data = $event->getData(); diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php index 57afff7362..1f8a77dc4f 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php @@ -1,17 +1,20 @@ 'id', 'choice_label' => 'name', 'choice_translation_domain' => false, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionCollectionType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionCollectionType.php index 84748c3c93..f848dc3ac7 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionCollectionType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionCollectionType.php @@ -1,17 +1,20 @@ add('price', MoneyType::class) - ->add('unitDefinition', ProductUnitDefinitionSelectionType::class); + ->add('unitDefinition', ProductUnitDefinitionSelectionType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionSelectionType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionSelectionType.php index afc463b60c..98d5dbc847 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionSelectionType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionSelectionType.php @@ -1,17 +1,20 @@ productUnitDefinitionRepository->find($value); - } + }, )); } @@ -53,7 +56,8 @@ public function configureOptions(OptionsResolver $resolver): void $resolver ->setDefaults([ 'csrf_protection' => false, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionType.php index 4f484aaf0d..3b6d4bf117 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionType.php @@ -1,17 +1,20 @@ add('unit', ProductUnitChoiceType::class) ->add('conversionRate', NumberType::class) - ->add('precision', IntegerType::class); + ->add('precision', IntegerType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionsChoiceType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionsChoiceType.php index 4c5f205b24..a9ff3cfdb5 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionsChoiceType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitDefinitionsChoiceType.php @@ -1,17 +1,20 @@ add('additionalUnitDefinitions', ProductUnitDefinitionCollectionType::class, [ 'mapped' => false, - ]); + ]) + ; } public function onSubmit(FormEvent $event): void diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitTranslationType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitTranslationType.php index 364ddae35e..12d073df48 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitTranslationType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitTranslationType.php @@ -1,17 +1,20 @@ add('fullLabel', TextType::class) ->add('fullPluralLabel', TextType::class) ->add('shortLabel', TextType::class) - ->add('shortPluralLabel', TextType::class); + ->add('shortPluralLabel', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitType.php b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitType.php index 1ea08b48f4..2e745b8e52 100644 --- a/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitType.php +++ b/src/CoreShop/Bundle/ProductBundle/Form/Type/Unit/ProductUnitType.php @@ -1,17 +1,20 @@ add('name', TextType::class) ->add('translations', ResourceTranslationsType::class, [ 'entry_type' => ProductUnitTranslationType::class, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/CategoryRepository.php b/src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/CategoryRepository.php index 467d60385f..30cd5766cc 100644 --- a/src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/CategoryRepository.php +++ b/src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/CategoryRepository.php @@ -1,17 +1,20 @@ setOrderKey( sprintf('o_%s ASC', $category->getChildrenSortBy()), - false + false, ); } else { $list->setOrderKey( 'o_key ASC', - false + false, ); } diff --git a/src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/ProductRepository.php b/src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/ProductRepository.php index 80f66d4833..cb5e636b99 100644 --- a/src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/ProductRepository.php +++ b/src/CoreShop/Bundle/ProductBundle/Pimcore/Repository/ProductRepository.php @@ -1,17 +1,20 @@ arrayCastRecursive($value); } if ($value instanceof \stdClass) { - $array[$key] = $this->arrayCastRecursive((array)$value); + $array[$key] = $this->arrayCastRecursive((array) $value); } } } if ($array instanceof \stdClass) { - return $this->arrayCastRecursive((array)$array); + return $this->arrayCastRecursive((array) $array); } return $array; @@ -509,7 +512,7 @@ protected function checkForRangeOrphans(EntityManager $entityManager, ProductQua $keepIds = []; foreach ($currentRanges as $currentRange) { if (isset($currentRange['id']) && $currentRange['id'] !== null) { - $keepIds[] = (int)$currentRange['id']; + $keepIds[] = (int) $currentRange['id']; } } diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/CoreShopProductQuantityPriceRulesBundle.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/CoreShopProductQuantityPriceRulesBundle.php index afea6c28a2..60efa07655 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/CoreShopProductQuantityPriceRulesBundle.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/CoreShopProductQuantityPriceRulesBundle.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; $this->addModelsSection($rootNode); $this->addPimcoreResourcesSection($rootNode); @@ -95,7 +99,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -126,6 +131,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/DependencyInjection/CoreShopProductQuantityPriceRulesExtension.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/DependencyInjection/CoreShopProductQuantityPriceRulesExtension.php index 45c6062cff..97d0e5a9fb 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/DependencyInjection/CoreShopProductQuantityPriceRulesExtension.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/DependencyInjection/CoreShopProductQuantityPriceRulesExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(ProductQuantityPriceRuleActionInterface::class) - ->addTag(ProductQuantityPriceRulesActionPass::PRODUCT_QUANTITY_PRICE_RULE_ACTION_TAG); + ->addTag(ProductQuantityPriceRulesActionPass::PRODUCT_QUANTITY_PRICE_RULE_ACTION_TAG) + ; $container ->registerForAutoconfiguration(CalculatorInterface::class) - ->addTag(ProductQuantityPriceRulesCalculatorPass::PRODUCT_QUANTITY_PRICE_RULE_CALCULATOR_TAG); + ->addTag(ProductQuantityPriceRulesCalculatorPass::PRODUCT_QUANTITY_PRICE_RULE_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(QuantityRuleConditionCheckerInterface::class) - ->addTag(ProductQuantityPriceRulesConditionPass::PRODUCT_QUANTITY_PRICE_RULE_CONDITION_TAG); + ->addTag(ProductQuantityPriceRulesConditionPass::PRODUCT_QUANTITY_PRICE_RULE_CONDITION_TAG) + ; } } diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Doctrine/ORM/ProductQuantityPriceRuleRepository.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Doctrine/ORM/ProductQuantityPriceRuleRepository.php index d10e588905..8e469ac2ae 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Doctrine/ORM/ProductQuantityPriceRuleRepository.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Doctrine/ORM/ProductQuantityPriceRuleRepository.php @@ -1,17 +1,20 @@ createQueryBuilder('o') ->andWhere('o.active = 1') ->getQuery() - ->getResult(); + ->getResult() + ; } public function findForProduct(QuantityRangePriceAwareInterface $product): array @@ -34,7 +38,8 @@ public function findForProduct(QuantityRangePriceAwareInterface $product): array ->andWhere('o.product = :productId') ->setParameter('productId', $product->getId()) ->getQuery() - ->getResult(); + ->getResult() + ; } public function findWithConditionOfType($conditionType): array @@ -44,7 +49,8 @@ public function findWithConditionOfType($conditionType): array ->andWhere('condition.type = :conditionType') ->setParameter('conditionType', $conditionType) ->getQuery() - ->getResult(); + ->getResult() + ; } public function findWithActionOfType($actionType): array diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Event/ProductQuantityPriceRuleValidationEvent.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Event/ProductQuantityPriceRuleValidationEvent.php index 0270b541b8..071a8806f8 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Event/ProductQuantityPriceRuleValidationEvent.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Event/ProductQuantityPriceRuleValidationEvent.php @@ -1,17 +1,20 @@ object = $object; diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityPriceRuleConditionChoiceType.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityPriceRuleConditionChoiceType.php index 89dcc6d644..df7043e905 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityPriceRuleConditionChoiceType.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityPriceRuleConditionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityPriceRuleType.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityPriceRuleType.php index 235a555aa5..eb0628a7a9 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityPriceRuleType.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityPriceRuleType.php @@ -1,17 +1,20 @@ add('active', CheckboxType::class) ->add('priority', NumberType::class) ->add('conditions', ProductQuantityPriceRuleConditionCollectionType::class) - ->add('ranges', ProductQuantityRangeCollectionType::class); + ->add('ranges', ProductQuantityRangeCollectionType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityRangeCollectionType.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityRangeCollectionType.php index 456eafe77e..786a226f41 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityRangeCollectionType.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/ProductQuantityRangeCollectionType.php @@ -1,17 +1,20 @@ add('pricingBehaviour', ChoiceType::class, [ 'choices' => $this->actionTypes, ]) - ->add('highlighted', CheckboxType::class, []); + ->add('highlighted', CheckboxType::class, []) + ; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/Rule/Condition/ProductQuantityPriceRuleNestedConfigurationType.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/Rule/Condition/ProductQuantityPriceRuleNestedConfigurationType.php index 2c7c1b96f2..aafbeb346c 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/Rule/Condition/ProductQuantityPriceRuleNestedConfigurationType.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/Rule/Condition/ProductQuantityPriceRuleNestedConfigurationType.php @@ -1,17 +1,20 @@ add('conditions', ProductQuantityPriceRuleConditionCollectionType::class, ['nested' => true]); + ->add('conditions', ProductQuantityPriceRuleConditionCollectionType::class, ['nested' => true]) + ; $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { $data = $event->getData(); diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php index 4384139a6a..80a6b0b9cc 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Form/Type/Rule/Condition/TimespanConfigurationType.php @@ -1,17 +1,20 @@ add('dateFrom', NumberType::class) - ->add('dateTo', NumberType::class); + ->add('dateTo', NumberType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Resources/public/pimcore/css/product-quanity-price-rules.css b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Resources/public/pimcore/css/product-quanity-price-rules.css index 82c09264b5..8ab4f3dde3 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Resources/public/pimcore/css/product-quanity-price-rules.css +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Resources/public/pimcore/css/product-quanity-price-rules.css @@ -1,12 +1,15 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ .coreshop_icon_product_quantity_price_rules, .pimcore_icon_coreShopProductQuantityPriceRules { diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Twig/ProductQuantityPriceRuleRangesExtension.php b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Twig/ProductQuantityPriceRuleRangesExtension.php index 9715fccfea..b276fb38b3 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Twig/ProductQuantityPriceRuleRangesExtension.php +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/Twig/ProductQuantityPriceRuleRangesExtension.php @@ -1,17 +1,20 @@ addCompilerPass($compilerPassClassName::$compilerPassMethod( [$this->getConfigFilesPath() => $this->getModelNamespace()], [$this->getObjectManagerParameter()], - sprintf('%s.driver.%s', $this->getBundlePrefix(), $driver) + sprintf('%s.driver.%s', $this->getBundlePrefix(), $driver), )); break; @@ -57,7 +60,7 @@ public function build(ContainerBuilder $container): void [$this->getModelNamespace()], [$this->getConfigFilesPath()], [sprintf('%s.object_manager', $this->getBundlePrefix())], - sprintf('%s.driver.%s', $this->getBundlePrefix(), $driver) + sprintf('%s.driver.%s', $this->getBundlePrefix(), $driver), )); break; @@ -136,7 +139,7 @@ protected function getConfigFilesPath(): string return sprintf( '%s/Resources/config/doctrine/%s', $this->getPath(), - strtolower($this->getDoctrineMappingDirectory()) + strtolower($this->getDoctrineMappingDirectory()), ); } diff --git a/src/CoreShop/Bundle/ResourceBundle/Command/CreateDatabaseTablesCommand.php b/src/CoreShop/Bundle/ResourceBundle/Command/CreateDatabaseTablesCommand.php index 2829e3b01e..5a12c7739f 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Command/CreateDatabaseTablesCommand.php +++ b/src/CoreShop/Bundle/ResourceBundle/Command/CreateDatabaseTablesCommand.php @@ -1,17 +1,20 @@ addArgument( 'application-name', - InputArgument::REQUIRED + InputArgument::REQUIRED, ) ->addOption( 'dump-sql', null, InputOption::VALUE_NONE, - 'Dumps the generated SQL statements to the screen (does not execute them).' + 'Dumps the generated SQL statements to the screen (does not execute them).', ) ->addOption( 'force', 'f', InputOption::VALUE_NONE, - 'Causes the generated SQL statements to be physically executed against your database.' - ); + 'Causes the generated SQL statements to be physically executed against your database.', + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/ResourceBundle/Command/DropDatabaseTablesCommand.php b/src/CoreShop/Bundle/ResourceBundle/Command/DropDatabaseTablesCommand.php index 949cee6d60..e2fb9e270f 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Command/DropDatabaseTablesCommand.php +++ b/src/CoreShop/Bundle/ResourceBundle/Command/DropDatabaseTablesCommand.php @@ -1,17 +1,20 @@ addArgument( 'application-name', - InputArgument::REQUIRED + InputArgument::REQUIRED, ) ->addOption( 'dump-sql', null, InputOption::VALUE_NONE, - 'Dumps the generated SQL statements to the screen (does not execute them).' + 'Dumps the generated SQL statements to the screen (does not execute them).', ) ->addOption( 'force', 'f', InputOption::VALUE_NONE, - 'Causes the generated SQL statements to be physically executed against your database.' - ); + 'Causes the generated SQL statements to be physically executed against your database.', + ) + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/ResourceBundle/Command/InstallResourcesCommand.php b/src/CoreShop/Bundle/ResourceBundle/Command/InstallResourcesCommand.php index 95a7a3daf4..0a69a1a393 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Command/InstallResourcesCommand.php +++ b/src/CoreShop/Bundle/ResourceBundle/Command/InstallResourcesCommand.php @@ -1,17 +1,20 @@ writeln(sprintf( 'Install Resources for Environment %s.', - $kernel->getEnvironment() + $kernel->getEnvironment(), )); $this->resourceInstaller->installResources($output, $input->getOption('application-name')); diff --git a/src/CoreShop/Bundle/ResourceBundle/ComposerPackageBundleInterface.php b/src/CoreShop/Bundle/ResourceBundle/ComposerPackageBundleInterface.php index 6ab056428d..a3fc6ed9de 100644 --- a/src/CoreShop/Bundle/ResourceBundle/ComposerPackageBundleInterface.php +++ b/src/CoreShop/Bundle/ResourceBundle/ComposerPackageBundleInterface.php @@ -1,17 +1,20 @@ eventDispatcher->dispatch( $event, - sprintf('%s.%s.%s', $metadata->getApplicationName(), $metadata->getName(), $eventName) + sprintf('%s.%s.%s', $metadata->getApplicationName(), $metadata->getName(), $eventName), ); } @@ -42,7 +45,7 @@ public function dispatchPreEvent($eventName, MetadataInterface $metadata, Resour $this->eventDispatcher->dispatch( $event, - sprintf('%s.%s.pre_%s', $metadata->getApplicationName(), $metadata->getName(), $eventName) + sprintf('%s.%s.pre_%s', $metadata->getApplicationName(), $metadata->getName(), $eventName), ); } @@ -52,7 +55,7 @@ public function dispatchPostEvent($eventName, MetadataInterface $metadata, Resou $this->eventDispatcher->dispatch( $event, - sprintf('%s.%s.post_%s', $metadata->getApplicationName(), $metadata->getName(), $eventName) + sprintf('%s.%s.post_%s', $metadata->getApplicationName(), $metadata->getName(), $eventName), ); } @@ -62,7 +65,7 @@ public function dispatchInitializeEvent($eventName, MetadataInterface $metadata, $this->eventDispatcher->dispatch( $event, - sprintf('%s.%s.initialize_%s', $metadata->getApplicationName(), $metadata->getName(), $eventName) + sprintf('%s.%s.initialize_%s', $metadata->getApplicationName(), $metadata->getName(), $eventName), ); } diff --git a/src/CoreShop/Bundle/ResourceBundle/Controller/EventDispatcherInterface.php b/src/CoreShop/Bundle/ResourceBundle/Controller/EventDispatcherInterface.php index 3d5c57265f..f41e2bd033 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Controller/EventDispatcherInterface.php +++ b/src/CoreShop/Bundle/ResourceBundle/Controller/EventDispatcherInterface.php @@ -1,17 +1,20 @@ getPermission()) { /** * @var User $user + * * @psalm-var User $user */ $user = method_exists($this, 'getAdminUser') ? $this->getAdminUser() : $this->getUser(); diff --git a/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceController.php b/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceController.php index 6bdab4b261..1f05b832a4 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceController.php +++ b/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceController.php @@ -1,17 +1,20 @@ getAdminUser() : $this->getUser(); @@ -76,7 +80,7 @@ public function getAction(Request $request): JsonResponse { $this->isGrantedOr403(); - $resources = $this->findOr404((int)$this->getParameterFromRequest($request, 'id')); + $resources = $this->findOr404((int) $this->getParameterFromRequest($request, 'id')); return $this->viewHandler->handle(['data' => $resources, 'success' => true], ['group' => 'Detailed']); } diff --git a/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceFormFactory.php b/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceFormFactory.php index 77f5cc66dc..37ba745f6f 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceFormFactory.php +++ b/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceFormFactory.php @@ -1,17 +1,20 @@ nameProperty, - $resource::class - ) + $resource::class, + ), ); } diff --git a/src/CoreShop/Bundle/ResourceBundle/CoreExtension/Multiselect.php b/src/CoreShop/Bundle/ResourceBundle/CoreExtension/Multiselect.php index 4959b28cec..d3b6901b50 100644 --- a/src/CoreShop/Bundle/ResourceBundle/CoreExtension/Multiselect.php +++ b/src/CoreShop/Bundle/ResourceBundle/CoreExtension/Multiselect.php @@ -1,17 +1,20 @@ getDataFromResource($data, $object, $params); } } @@ -178,7 +181,7 @@ public function getDataForResource($data, $object = null, $params = []) */ public function getDataFromResource($data, $object = null, $params = []) { - if ((int)$data > 0) { + if ((int) $data > 0) { return $this->getRepository()->find($data); } diff --git a/src/CoreShop/Bundle/ResourceBundle/CoreExtension/TempEntityManagerTrait.php b/src/CoreShop/Bundle/ResourceBundle/CoreExtension/TempEntityManagerTrait.php index 9e551eb66a..18400ddf0c 100644 --- a/src/CoreShop/Bundle/ResourceBundle/CoreExtension/TempEntityManagerTrait.php +++ b/src/CoreShop/Bundle/ResourceBundle/CoreExtension/TempEntityManagerTrait.php @@ -1,17 +1,20 @@ repository = $repository; diff --git a/src/CoreShop/Bundle/ResourceBundle/DataHub/QueryType/Select.php b/src/CoreShop/Bundle/ResourceBundle/DataHub/QueryType/Select.php index 912fb16561..af62c1c21c 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DataHub/QueryType/Select.php +++ b/src/CoreShop/Bundle/ResourceBundle/DataHub/QueryType/Select.php @@ -1,17 +1,20 @@ $this->getFieldType($fieldDefinition, $class, $container), 'resolve' => $this->getResolver($attribute, $fieldDefinition, $class), ], - $container + $container, ); } diff --git a/src/CoreShop/Bundle/ResourceBundle/DataHub/Resolver/MultiResourceResolver.php b/src/CoreShop/Bundle/ResourceBundle/DataHub/Resolver/MultiResourceResolver.php index 46c9005fb9..ca3530d280 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DataHub/Resolver/MultiResourceResolver.php +++ b/src/CoreShop/Bundle/ResourceBundle/DataHub/Resolver/MultiResourceResolver.php @@ -1,17 +1,20 @@ getClass('model'), new Reference($id), - ] + ], ); } } diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterPimcoreResourcesPass.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterPimcoreResourcesPass.php index d6601a7acb..84ff6487b5 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterPimcoreResourcesPass.php +++ b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterPimcoreResourcesPass.php @@ -1,17 +1,20 @@ setFactory([Metadata::class, 'fromAliasAndConfiguration']) - ->setArguments([$alias, ['driver' => CoreShopResourceBundle::DRIVER_PIMCORE]]); + ->setArguments([$alias, ['driver' => CoreShopResourceBundle::DRIVER_PIMCORE]]) + ; $repositoryDefinition = new Definition(StackRepository::class); $repositoryDefinition->setArguments([ @@ -58,7 +62,8 @@ public function process(ContainerBuilder $container): void ]); $container->setDefinition(sprintf('%s.repository.stack.%s', $applicationName, $name), $repositoryDefinition) - ->setPublic(true); + ->setPublic(true) + ; } } } diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/ValidatorAutoMappingFixPass.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/ValidatorAutoMappingFixPass.php index e13ddc17b8..68936f0fce 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/ValidatorAutoMappingFixPass.php +++ b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/ValidatorAutoMappingFixPass.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } private function addTranslationsSection(ArrayNodeDefinition $node): void @@ -120,7 +124,8 @@ private function addTranslationsSection(ArrayNodeDefinition $node): void ->children() ->scalarNode('locale_provider')->defaultValue(TranslationLocaleProviderInterface::class)->cannotBeEmpty()->end() ->end() - ->end(); + ->end() + ; } private function addDriversSection(ArrayNodeDefinition $node): void @@ -131,7 +136,8 @@ private function addDriversSection(ArrayNodeDefinition $node): void ->defaultValue([CoreShopResourceBundle::DRIVER_DOCTRINE_ORM]) ->enumPrototype()->values(CoreShopResourceBundle::getAvailableDrivers())->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -158,6 +164,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/CoreShopResourceExtension.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/CoreShopResourceExtension.php index 10379f703a..77c4c7ac90 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/CoreShopResourceExtension.php +++ b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/CoreShopResourceExtension.php @@ -1,24 +1,26 @@ loadResources($configs['resources'], $container); $this->loadPimcoreModels($configs['pimcore'], $container); - $bodyListener = new Definition(BodyListener::class); $bodyListener->addTag('kernel.event_listener', [ 'event' => 'kernel.request', @@ -78,7 +79,8 @@ public function load(array $configs, ContainerBuilder $container): void $container ->registerForAutoconfiguration(ResourceInstallerInterface::class) - ->addTag(RegisterInstallersPass::INSTALLER_TAG); + ->addTag(RegisterInstallersPass::INSTALLER_TAG) + ; } private function loadPersistence(array $drivers, array $resources, LoaderInterface $loader): void @@ -88,7 +90,7 @@ private function loadPersistence(array $drivers, array $resources, LoaderInterfa throw new InvalidArgumentException(sprintf( 'Resource "%s" uses driver "%s", but this driver has not been enabled.', $alias, - $resource['driver'] + $resource['driver'], )); } } @@ -135,17 +137,17 @@ protected function loadPimcoreModels(array $models, ContainerBuilder $container) CoreShopResourceBundle::PIMCORE_MODEL_TYPE_FIELD_COLLECTION => str_replace( 'Pimcore\Model\DataObject\Fieldcollection\Data\\', '', - $resourceConfig['classes']['model'] + $resourceConfig['classes']['model'], ), CoreShopResourceBundle::PIMCORE_MODEL_TYPE_BRICK => str_replace( 'Pimcore\Model\DataObject\Objectbrick\Data\\', '', - $resourceConfig['classes']['model'] + $resourceConfig['classes']['model'], ), default => str_replace( 'Pimcore\Model\DataObject\\', '', - $resourceConfig['classes']['model'] + $resourceConfig['classes']['model'], ), }; diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/AbstractDriver.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/AbstractDriver.php index 12c5e83a24..01a271a4d1 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/AbstractDriver.php +++ b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/AbstractDriver.php @@ -1,17 +1,20 @@ addMethodCall('setContainer', [new Reference('service_container')]); + ->addMethodCall('setContainer', [new Reference('service_container')]) + ; $container->setDefinition($metadata->getServiceId('admin_controller'), $definition); } @@ -109,7 +113,7 @@ protected function addFactory(ContainerBuilder $container, MetadataInterface $me $container->registerAliasForArgument( $metadata->getServiceId('factory'), $typehintClass, - $metadata->getHumanizedName() . ' factory' + $metadata->getHumanizedName() . ' factory', ); } } @@ -120,7 +124,8 @@ protected function getMetadataDefinition(MetadataInterface $metadata): Definitio $definition = new Definition(Metadata::class); $definition ->setFactory([new Reference(RegistryInterface::class), 'get']) - ->setArguments([$metadata->getAlias()]); + ->setArguments([$metadata->getAlias()]) + ; return $definition; } diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Doctrine/AbstractDoctrineDriver.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Doctrine/AbstractDoctrineDriver.php index 0551c9df6d..7358a6c0ec 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Doctrine/AbstractDoctrineDriver.php +++ b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Doctrine/AbstractDoctrineDriver.php @@ -1,17 +1,20 @@ setFactory([new Reference($this->getManagerServiceId($metadata)), 'getClassMetadata']) ->setArguments([$metadata->getClass('model')]) - ->setPublic(false); + ->setPublic(false) + ; return $definition; } @@ -42,14 +46,14 @@ protected function addManager(ContainerBuilder $container, MetadataInterface $me $container->setAlias( $metadata->getServiceId('manager'), - $alias + $alias, ); if (method_exists($container, 'registerAliasForArgument')) { $container->registerAliasForArgument( $metadata->getServiceId('manager'), ObjectManager::class, - $metadata->getHumanizedName() . ' manager' + $metadata->getHumanizedName() . ' manager', ); } } diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Doctrine/DoctrineORMDriver.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Doctrine/DoctrineORMDriver.php index 325f766ec5..f13750061e 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Doctrine/DoctrineORMDriver.php +++ b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Doctrine/DoctrineORMDriver.php @@ -1,17 +1,20 @@ registerAliasForArgument( $metadata->getServiceId('repository'), $typehintClass, - $metadata->getHumanizedName() . ' repository' + $metadata->getHumanizedName() . ' repository', ); } } @@ -102,7 +105,7 @@ protected function addRepositoryFactory(ContainerBuilder $container, MetadataInt $container->registerAliasForArgument( $metadata->getServiceId('repository.factory'), $typehintClass, - $metadata->getHumanizedName() . ' repository factory' + $metadata->getHumanizedName() . ' repository factory', ); } } @@ -116,7 +119,7 @@ protected function addManager(ContainerBuilder $container, MetadataInterface $me $container->registerAliasForArgument( $metadata->getServiceId('manager'), EntityManagerInterface::class, - $metadata->getHumanizedName() . ' manager' + $metadata->getHumanizedName() . ' manager', ); } } diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/DriverInterface.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/DriverInterface.php index 87d10f308a..9408dc85c2 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/DriverInterface.php +++ b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/DriverInterface.php @@ -1,17 +1,20 @@ registerAliasForArgument( $metadata->getServiceId('repository'), $typehintClass, - $metadata->getHumanizedName() . ' repository' + $metadata->getHumanizedName() . ' repository', ); } } @@ -205,7 +208,7 @@ protected function addRepositoryFactory(ContainerBuilder $container, MetadataInt $container->registerAliasForArgument( $metadata->getServiceId('repository.factory'), $typehintClass, - $metadata->getHumanizedName() . ' repository factory' + $metadata->getHumanizedName() . ' repository factory', ); } } @@ -218,14 +221,14 @@ protected function addManager(ContainerBuilder $container, MetadataInterface $me $container->setAlias( $metadata->getServiceId('manager'), - $alias + $alias, ); if (method_exists($container, 'registerAliasForArgument')) { $container->registerAliasForArgument( $metadata->getServiceId('manager'), ObjectManager::class, - $metadata->getHumanizedName() . ' manager' + $metadata->getHumanizedName() . ' manager', ); } } diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Extension/AbstractModelExtension.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Extension/AbstractModelExtension.php index 6ce14e8fc3..e75c046bc5 100644 --- a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Extension/AbstractModelExtension.php +++ b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Extension/AbstractModelExtension.php @@ -1,17 +1,20 @@ str_replace( 'Pimcore\Model\DataObject\Fieldcollection\Data\\', '', - $modelConfig['classes']['model'] + $modelConfig['classes']['model'], ), CoreShopResourceBundle::PIMCORE_MODEL_TYPE_BRICK => str_replace( 'Pimcore\Model\DataObject\Objectbrick\Data\\', '', - $modelConfig['classes']['model'] + $modelConfig['classes']['model'], ), default => str_replace( 'Pimcore\Model\DataObject\\', '', - $modelConfig['classes']['model'] + $modelConfig['classes']['model'], ), }; diff --git a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php index dc5314b530..a24e7fc9f5 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php +++ b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityMerger.php @@ -1,17 +1,20 @@ em, $class, - $origDataCollection + $origDataCollection, ); $newCollection->setOwner($entity, $assoc); $newCollection->takeSnapshot(); @@ -193,8 +195,7 @@ private function checkAssociations($entity, $managedCopy, array &$visited): void if ($managedCopy) { $snapshotEntries[] = $managedCopy; - } - else { + } else { $snapshotEntries[] = $snapshotEntry; } } diff --git a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityRepository.php b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityRepository.php index 6ab7c91e97..ce621e4279 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityRepository.php +++ b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ORM/EntityRepository.php @@ -1,17 +1,20 @@ createQueryBuilder('o') ->getQuery() - ->getResult(); + ->getResult() + ; } protected function getPropertyName(string $name): string diff --git a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ResourceMappingDriverChain.php b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ResourceMappingDriverChain.php index c459d6c70a..0ba81ab37d 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Doctrine/ResourceMappingDriverChain.php +++ b/src/CoreShop/Bundle/ResourceBundle/Doctrine/ResourceMappingDriverChain.php @@ -1,17 +1,21 @@ setDefaultDriver($mappingDriver); } diff --git a/src/CoreShop/Bundle/ResourceBundle/Event/ResourceControllerEvent.php b/src/CoreShop/Bundle/ResourceBundle/Event/ResourceControllerEvent.php index f239d7be8f..382faef5a2 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Event/ResourceControllerEvent.php +++ b/src/CoreShop/Bundle/ResourceBundle/Event/ResourceControllerEvent.php @@ -1,17 +1,20 @@ getArgument('copier'); $copier->addFilter( new DoctrineCollectionFilter(), - new PropertyTypeMatcher('Doctrine\Common\Collections\Collection') + new PropertyTypeMatcher('Doctrine\Common\Collections\Collection'), ); $event->setArgument('copier', $copier); } diff --git a/src/CoreShop/Bundle/ResourceBundle/EventListener/ORMMappedSuperClassSubscriber.php b/src/CoreShop/Bundle/ResourceBundle/EventListener/ORMMappedSuperClassSubscriber.php index 9d7f193e87..9cb086b4fb 100644 --- a/src/CoreShop/Bundle/ResourceBundle/EventListener/ORMMappedSuperClassSubscriber.php +++ b/src/CoreShop/Bundle/ResourceBundle/EventListener/ORMMappedSuperClassSubscriber.php @@ -1,17 +1,20 @@ getNamingStrategy() + $configuration->getNamingStrategy(), ); // Wakeup Reflection @@ -107,7 +110,7 @@ private function isRelation(int $type): bool ClassMetadataInfo::ONE_TO_MANY, ClassMetadataInfo::ONE_TO_ONE, ], - true + true, ); } } diff --git a/src/CoreShop/Bundle/ResourceBundle/EventListener/ORMRepositoryClassSubscriber.php b/src/CoreShop/Bundle/ResourceBundle/EventListener/ORMRepositoryClassSubscriber.php index 850b0763fa..42fa17fa93 100644 --- a/src/CoreShop/Bundle/ResourceBundle/EventListener/ORMRepositoryClassSubscriber.php +++ b/src/CoreShop/Bundle/ResourceBundle/EventListener/ORMRepositoryClassSubscriber.php @@ -1,17 +1,20 @@ addError(new FormError( call_user_func($form->getConfig()->getOption('upload_max_size_message')), null, - ['{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()] + ['{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()], )); return; diff --git a/src/CoreShop/Bundle/ResourceBundle/Form/Helper/ErrorSerializer.php b/src/CoreShop/Bundle/ResourceBundle/Form/Helper/ErrorSerializer.php index c56134cdc7..e67110a226 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Form/Helper/ErrorSerializer.php +++ b/src/CoreShop/Bundle/ResourceBundle/Form/Helper/ErrorSerializer.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/GridConfigConfiguration.php b/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/GridConfigConfiguration.php index 70ee81ea9d..869635b81b 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/GridConfigConfiguration.php +++ b/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/GridConfigConfiguration.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/ImageThumbnailConfiguration.php b/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/ImageThumbnailConfiguration.php index b5baa82ea5..4e47ab3f1f 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/ImageThumbnailConfiguration.php +++ b/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/ImageThumbnailConfiguration.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/RouteConfiguration.php b/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/RouteConfiguration.php index d6316ac171..ae661a3cfe 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/RouteConfiguration.php +++ b/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/RouteConfiguration.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/TranslationConfiguration.php b/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/TranslationConfiguration.php index 27e1dcbdcf..1bcc38113c 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/TranslationConfiguration.php +++ b/src/CoreShop/Bundle/ResourceBundle/Installer/Configuration/TranslationConfiguration.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreClassInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreClassInstaller.php index 9bb3d7b1b7..f3bc482e67 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreClassInstaller.php +++ b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreClassInstaller.php @@ -1,17 +1,20 @@ kernel->getContainer()->hasParameter($parameter)) { @@ -61,7 +64,7 @@ public function installResources(OutputInterface $output, string $applicationNam $documents = Yaml::parse(file_get_contents($file)); $documents = $processor->processConfiguration( $configurationDefinition, - ['documents' => $documents] + ['documents' => $documents], ); $documents = $documents['documents']; @@ -94,7 +97,7 @@ public function installResources(OutputInterface $output, string $applicationNam foreach ($docsToInstall as $docData) { $progress->setMessage( - sprintf('Install Document %s/%s', $docData['path'], $docData['key']) + sprintf('Install Document %s/%s', $docData['path'], $docData['key']), ); foreach ($validLanguages as $language) { @@ -115,7 +118,7 @@ public function installResources(OutputInterface $output, string $applicationNam foreach ($languagesDone as $doneLanguage) { $translatedDocument = Document::getByPath( $rootDocument->getRealFullPath( - ) . '/' . $doneLanguage . '/' . $docData['path'] . '/' . $docData['key'] + ) . '/' . $doneLanguage . '/' . $docData['path'] . '/' . $docData['key'], ); if ($translatedDocument) { @@ -149,11 +152,12 @@ private function installDocument(Document $rootDocument, string $language, array if (\Pimcore\Tool::classExists($class)) { /** * @var Document $document + * * @psalm-var class-string $class */ $document = new $class(); $document->setParent( - Document::getByPath($rootDocument->getRealFullPath() . '/' . $language . '/' . $properties['path']) + Document::getByPath($rootDocument->getRealFullPath() . '/' . $language . '/' . $properties['path']), ); $document->setKey(Service::getValidKey($properties['key'], 'document')); diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreGridConfigInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreGridConfigInstaller.php index 762ee14d92..ad46825eed 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreGridConfigInstaller.php +++ b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreGridConfigInstaller.php @@ -1,17 +1,20 @@ setObjectVar( $fd->getName(), - $fd->marshalForCache($data, $data->getObjectVar($fd->getName())) + $fd->marshalForCache($data, $data->getObjectVar($fd->getName())), ); } } @@ -75,7 +74,7 @@ public function unmarshall(string $value) $data->setObjectVar( $fd->getName(), - $fd->unmarshalForCache($data, $data->getObjectVar($fd->getName())) + $fd->unmarshalForCache($data, $data->getObjectVar($fd->getName())), ); } } diff --git a/src/CoreShop/Bundle/ResourceBundle/Pimcore/ObjectManager.php b/src/CoreShop/Bundle/ResourceBundle/Pimcore/ObjectManager.php index 43f25fa4f4..2aad9e846f 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Pimcore/ObjectManager.php +++ b/src/CoreShop/Bundle/ResourceBundle/Pimcore/ObjectManager.php @@ -1,17 +1,20 @@ addConditionParam( $criterion['condition'], - $criterion['variable'] ?? null + $criterion['variable'] ?? null, ); } } diff --git a/src/CoreShop/Bundle/ResourceBundle/Pimcore/PimcoreRepository.php b/src/CoreShop/Bundle/ResourceBundle/Pimcore/PimcoreRepository.php index f4159feb01..4dc723b928 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Pimcore/PimcoreRepository.php +++ b/src/CoreShop/Bundle/ResourceBundle/Pimcore/PimcoreRepository.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/ResourceBundle/Routing/ResourceLoader.php b/src/CoreShop/Bundle/ResourceBundle/Routing/ResourceLoader.php index 960e9ee38a..933521eb89 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Routing/ResourceLoader.php +++ b/src/CoreShop/Bundle/ResourceBundle/Routing/ResourceLoader.php @@ -1,17 +1,20 @@ getActive()) { $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $this->formatValue($value)) - ->addViolation(); + ->addViolation() + ; } } else { throw new UnexpectedTypeException($value, ToggleableInterface::class); diff --git a/src/CoreShop/Bundle/ResourceBundle/Validator/Constraints/UniqueEntity.php b/src/CoreShop/Bundle/ResourceBundle/Validator/Constraints/UniqueEntity.php index 7fa3666535..9ae450fab0 100644 --- a/src/CoreShop/Bundle/ResourceBundle/Validator/Constraints/UniqueEntity.php +++ b/src/CoreShop/Bundle/ResourceBundle/Validator/Constraints/UniqueEntity.php @@ -1,17 +1,20 @@ $getter(); @@ -119,7 +124,8 @@ public function validate($value, Constraint $constraint): void ->setParameter('{{ value }}', $criteria[$fields[0]]) ->setInvalidValue($criteria[$fields[0]]) ->setCause($value) - ->addViolation(); + ->addViolation() + ; } } } diff --git a/src/CoreShop/Bundle/RuleBundle/Assessor/RuleAvailabilityAssessor.php b/src/CoreShop/Bundle/RuleBundle/Assessor/RuleAvailabilityAssessor.php index 99fe546dac..61ad3454b4 100644 --- a/src/CoreShop/Bundle/RuleBundle/Assessor/RuleAvailabilityAssessor.php +++ b/src/CoreShop/Bundle/RuleBundle/Assessor/RuleAvailabilityAssessor.php @@ -1,17 +1,20 @@ setName('coreshop:rules:check-availability') - ->setDescription('Check for outdated / invalid rules and disable them.'); + ->setDescription('Check for outdated / invalid rules and disable them.') + ; } protected function execute(InputInterface $input, OutputInterface $output): int diff --git a/src/CoreShop/Bundle/RuleBundle/CoreShopRuleBundle.php b/src/CoreShop/Bundle/RuleBundle/CoreShopRuleBundle.php index a83f0a460b..6bdd06d65b 100644 --- a/src/CoreShop/Bundle/RuleBundle/CoreShopRuleBundle.php +++ b/src/CoreShop/Bundle/RuleBundle/CoreShopRuleBundle.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -108,6 +112,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/RuleBundle/DependencyInjection/CoreShopRuleExtension.php b/src/CoreShop/Bundle/RuleBundle/DependencyInjection/CoreShopRuleExtension.php index 532a3ab573..f9ccb5da6a 100644 --- a/src/CoreShop/Bundle/RuleBundle/DependencyInjection/CoreShopRuleExtension.php +++ b/src/CoreShop/Bundle/RuleBundle/DependencyInjection/CoreShopRuleExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(RuleAvailabilityAssessorInterface::class) - ->addTag(RuleAvailabilityAssessorPass::RULE_AVAILABILITY_ASSESSOR_TAG); + ->addTag(RuleAvailabilityAssessorPass::RULE_AVAILABILITY_ASSESSOR_TAG) + ; $container ->registerForAutoconfiguration(RuleConditionsValidationProcessorInterface::class) - ->addTag(TraceableValidationProcessorPass::RULE_CONDITIONS_VALIDATIONS_PROCESSOR); + ->addTag(TraceableValidationProcessorPass::RULE_CONDITIONS_VALIDATIONS_PROCESSOR) + ; } } diff --git a/src/CoreShop/Bundle/RuleBundle/Doctrine/ORM/RuleRepository.php b/src/CoreShop/Bundle/RuleBundle/Doctrine/ORM/RuleRepository.php index e599ccdf82..c4783734e4 100644 --- a/src/CoreShop/Bundle/RuleBundle/Doctrine/ORM/RuleRepository.php +++ b/src/CoreShop/Bundle/RuleBundle/Doctrine/ORM/RuleRepository.php @@ -1,17 +1,20 @@ createQueryBuilder('o') ->andWhere('o.active = 1') ->getQuery() - ->getResult(); + ->getResult() + ; } public function findWithConditionOfType($conditionType): array @@ -34,7 +38,8 @@ public function findWithConditionOfType($conditionType): array ->andWhere('condition.type = :conditionType') ->setParameter('conditionType', $conditionType) ->getQuery() - ->getResult(); + ->getResult() + ; } public function findWithActionOfType($actionType): array @@ -44,6 +49,7 @@ public function findWithActionOfType($actionType): array ->andWhere('action.type = :actionType') ->setParameter('actionType', $actionType) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/RuleBundle/Event/RuleAvailabilityCheckEvent.php b/src/CoreShop/Bundle/RuleBundle/Event/RuleAvailabilityCheckEvent.php index 8f05016d82..88f3f401ca 100644 --- a/src/CoreShop/Bundle/RuleBundle/Event/RuleAvailabilityCheckEvent.php +++ b/src/CoreShop/Bundle/RuleBundle/Event/RuleAvailabilityCheckEvent.php @@ -1,17 +1,20 @@ addConfigurationFields($event->getForm(), $this->formTypeRegistry->get($data['type'], 'default')); - }); + }) + ; } public function configureOptions(OptionsResolver $resolver): void @@ -75,7 +82,8 @@ public function configureOptions(OptionsResolver $resolver): void $resolver ->setDefault('configuration_type', null) - ->setAllowedTypes('configuration_type', ['string', 'null']); + ->setAllowedTypes('configuration_type', ['string', 'null']) + ; } /** diff --git a/src/CoreShop/Bundle/RuleBundle/Form/Type/Core/AbstractConfigurationCollectionType.php b/src/CoreShop/Bundle/RuleBundle/Form/Type/Core/AbstractConfigurationCollectionType.php index b355d82268..9e8e3ec8b4 100644 --- a/src/CoreShop/Bundle/RuleBundle/Form/Type/Core/AbstractConfigurationCollectionType.php +++ b/src/CoreShop/Bundle/RuleBundle/Form/Type/Core/AbstractConfigurationCollectionType.php @@ -1,17 +1,20 @@ $type] - ) + ['configuration_type' => $type], + ), ); $prototypes[$type] = $formBuilder->getForm(); diff --git a/src/CoreShop/Bundle/RuleBundle/Form/Type/Rule/Condition/AbstractNestedConfigurationType.php b/src/CoreShop/Bundle/RuleBundle/Form/Type/Rule/Condition/AbstractNestedConfigurationType.php index 0e3a17fcfc..06c44763f5 100644 --- a/src/CoreShop/Bundle/RuleBundle/Form/Type/Rule/Condition/AbstractNestedConfigurationType.php +++ b/src/CoreShop/Bundle/RuleBundle/Form/Type/Rule/Condition/AbstractNestedConfigurationType.php @@ -1,17 +1,20 @@ ['coreshop']]), ], 'choices' => ['and' => 'and', 'or' => 'or', 'not' => 'not'], - ]); + ]) + ; } } diff --git a/src/CoreShop/Bundle/RuleBundle/Form/Type/Rule/EmptyConfigurationFormType.php b/src/CoreShop/Bundle/RuleBundle/Form/Type/Rule/EmptyConfigurationFormType.php index cef07c81b6..04aa9c099b 100644 --- a/src/CoreShop/Bundle/RuleBundle/Form/Type/Rule/EmptyConfigurationFormType.php +++ b/src/CoreShop/Bundle/RuleBundle/Form/Type/Rule/EmptyConfigurationFormType.php @@ -1,17 +1,20 @@ add('name', TextType::class) ->add('conditions', RuleConditionCollectionType::class) - ->add('actions', RuleActionCollectionType::class); + ->add('actions', RuleActionCollectionType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/RuleBundle/Processor/RuleAvailabilityProcessor.php b/src/CoreShop/Bundle/RuleBundle/Processor/RuleAvailabilityProcessor.php index c799242710..6e077c0a0d 100644 --- a/src/CoreShop/Bundle/RuleBundle/Processor/RuleAvailabilityProcessor.php +++ b/src/CoreShop/Bundle/RuleBundle/Processor/RuleAvailabilityProcessor.php @@ -1,17 +1,20 @@ eventDispatcher->dispatch( new RuleAvailabilityCheckEvent($rule, $rule::class, $ruleIsAvailable), - 'coreshop.rule.availability_check' + 'coreshop.rule.availability_check', ); if ($event->isAvailable() === false) { diff --git a/src/CoreShop/Bundle/RuleBundle/Processor/RuleAvailabilityProcessorInterface.php b/src/CoreShop/Bundle/RuleBundle/Processor/RuleAvailabilityProcessorInterface.php index 47d0ae89fe..082b240542 100644 --- a/src/CoreShop/Bundle/RuleBundle/Processor/RuleAvailabilityProcessorInterface.php +++ b/src/CoreShop/Bundle/RuleBundle/Processor/RuleAvailabilityProcessorInterface.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(ExtractorInterface::class) - ->addTag(ExtractorRegistryServicePass::EXTRACTOR_TAG); + ->addTag(ExtractorRegistryServicePass::EXTRACTOR_TAG) + ; } } diff --git a/src/CoreShop/Bundle/SequenceBundle/CoreShopSequenceBundle.php b/src/CoreShop/Bundle/SequenceBundle/CoreShopSequenceBundle.php index b702ab8105..4381dd5c77 100644 --- a/src/CoreShop/Bundle/SequenceBundle/CoreShopSequenceBundle.php +++ b/src/CoreShop/Bundle/SequenceBundle/CoreShopSequenceBundle.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/SequenceBundle/DependencyInjection/CoreShopSequenceExtension.php b/src/CoreShop/Bundle/SequenceBundle/DependencyInjection/CoreShopSequenceExtension.php index dd7d512c8b..fa321a097d 100644 --- a/src/CoreShop/Bundle/SequenceBundle/DependencyInjection/CoreShopSequenceExtension.php +++ b/src/CoreShop/Bundle/SequenceBundle/DependencyInjection/CoreShopSequenceExtension.php @@ -1,17 +1,20 @@ andWhere('o.type = :type') ->setParameter('type', $type) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/ShippingBundle/Controller/CarrierController.php b/src/CoreShop/Bundle/ShippingBundle/Controller/CarrierController.php index 8956a40178..2800e9f62c 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Controller/CarrierController.php +++ b/src/CoreShop/Bundle/ShippingBundle/Controller/CarrierController.php @@ -1,17 +1,20 @@ true, 'taxCalculationStrategies' => $convertedStrategies, - ] + ], ); } } diff --git a/src/CoreShop/Bundle/ShippingBundle/Controller/ShippingRuleController.php b/src/CoreShop/Bundle/ShippingBundle/Controller/ShippingRuleController.php index 749c4ad10d..b5df58ca52 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Controller/ShippingRuleController.php +++ b/src/CoreShop/Bundle/ShippingBundle/Controller/ShippingRuleController.php @@ -1,17 +1,20 @@ addDefaultsIfNotSet() ->children() ->scalarNode('default_resolver')->cannotBeEmpty()->end() - ->end(); + ->end() + ; $this->addModelsSection($rootNode); $this->addPimcoreResourcesSection($rootNode); @@ -131,7 +135,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -162,6 +167,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/ShippingBundle/DependencyInjection/CoreShopShippingExtension.php b/src/CoreShop/Bundle/ShippingBundle/DependencyInjection/CoreShopShippingExtension.php index a377df1d13..ef6658bdae 100644 --- a/src/CoreShop/Bundle/ShippingBundle/DependencyInjection/CoreShopShippingExtension.php +++ b/src/CoreShop/Bundle/ShippingBundle/DependencyInjection/CoreShopShippingExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(ShippableCarrierValidatorInterface::class) - ->addTag(CompositeShippableValidatorPass::SHIPABLE_VALIDATOR_TAG); + ->addTag(CompositeShippableValidatorPass::SHIPABLE_VALIDATOR_TAG) + ; $container ->registerForAutoconfiguration(CarrierPriceCalculatorInterface::class) - ->addTag(ShippingPriceCalculatorsPass::SHIPPING_PRICE_CALCULATOR_TAG); + ->addTag(ShippingPriceCalculatorsPass::SHIPPING_PRICE_CALCULATOR_TAG) + ; $container ->registerForAutoconfiguration(ShippingRuleActionProcessorInterface::class) - ->addTag(ShippingRuleActionPass::SHIPPING_RULE_ACTION_TAG); + ->addTag(ShippingRuleActionPass::SHIPPING_RULE_ACTION_TAG) + ; $container ->registerForAutoconfiguration(ShippingConditionCheckerInterface::class) - ->addTag(ShippingRuleConditionPass::SHIPPING_RULE_CONDITION_TAG); + ->addTag(ShippingRuleConditionPass::SHIPPING_RULE_CONDITION_TAG) + ; $container ->registerForAutoconfiguration(TaxCalculationStrategyInterface::class) - ->addTag(ShippingTaxCalculationStrategyPass::SHIPPING_TAX_STRATEGY_TAG); + ->addTag(ShippingTaxCalculationStrategyPass::SHIPPING_TAX_STRATEGY_TAG) + ; } } diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierChoiceType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierChoiceType.php index 1efe35e2c5..67272d14e8 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierChoiceType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierChoiceType.php @@ -1,17 +1,20 @@ 'identifier', 'choice_translation_domain' => false, 'active' => true, - ]); + ]) + ; } public function buildView(FormView $view, FormInterface $form, array $options): void diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierTranslationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierTranslationType.php index 8d99d383e3..eb0180a8db 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierTranslationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierTranslationType.php @@ -1,17 +1,20 @@ add('title', TextType::class) ->add('description', TextareaType::class, [ 'required' => false, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierType.php index 4bfde67e70..e6d750eb4a 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/CarrierType.php @@ -1,17 +1,20 @@ add('shippingRules', ShippingRuleGroupCollectionType::class) ->add('translations', ResourceTranslationsType::class, [ 'entry_type' => CarrierTranslationType::class, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Action/AdditionPercentActionConfigurationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Action/AdditionPercentActionConfigurationType.php index a08e850773..82ede27bac 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Action/AdditionPercentActionConfigurationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Action/AdditionPercentActionConfigurationType.php @@ -1,17 +1,20 @@ 'numeric', 'groups' => $this->validationGroups]), new Range(['min' => 0, 'max' => 100, 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Action/DiscountPercentActionConfigurationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Action/DiscountPercentActionConfigurationType.php index 5603538b08..847ca5f4fc 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Action/DiscountPercentActionConfigurationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Action/DiscountPercentActionConfigurationType.php @@ -1,17 +1,20 @@ 'numeric', 'groups' => $this->validationGroups]), new Range(['min' => 0, 'max' => 100, 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Common/ShippingRuleConfigurationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Common/ShippingRuleConfigurationType.php index 06b62fb0e3..a00c442de9 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Common/ShippingRuleConfigurationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Common/ShippingRuleConfigurationType.php @@ -1,17 +1,20 @@ [ new NotBlank(['groups' => $this->validationGroups]), ], - ]); + ]) + ; $builder->get('shippingRule')->addModelTransformer(new CallbackTransformer( function (mixed $shippingRule) { @@ -53,7 +57,7 @@ function (mixed $shippingRule) { } return null; - } + }, )); } diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/AmountConfigurationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/AmountConfigurationType.php index 2df1125885..258f30af4e 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/AmountConfigurationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/AmountConfigurationType.php @@ -1,17 +1,20 @@ 'numeric', 'groups' => $this->validationGroups]), ], ]) - ->add('gross', CheckboxType::class, []); + ->add('gross', CheckboxType::class, []) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/DimensionConfigurationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/DimensionConfigurationType.php index dd6ae38347..d04a5b91fe 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/DimensionConfigurationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/DimensionConfigurationType.php @@ -1,17 +1,20 @@ $this->validationGroups]), new Type(['type' => 'numeric', 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/NestedConfigurationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/NestedConfigurationType.php index e637a2334d..b53252ba8e 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/NestedConfigurationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/NestedConfigurationType.php @@ -1,17 +1,20 @@ add('conditions', ShippingRuleConditionCollectionType::class, [ 'constraints' => [new Valid(['groups' => $this->validationGroups])], 'nested' => true, - ]); + ]) + ; $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { $data = $event->getData(); diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/PostcodeConfigurationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/PostcodeConfigurationType.php index 782f556405..7371931756 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/PostcodeConfigurationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/PostcodeConfigurationType.php @@ -1,17 +1,20 @@ add('postcodes', TextType::class, [ ]) - ->add('exclusion', CheckboxType::class); + ->add('exclusion', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/WeightConfigurationType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/WeightConfigurationType.php index 4f29e603d6..748b07560a 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/WeightConfigurationType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/Rule/Condition/WeightConfigurationType.php @@ -1,17 +1,20 @@ $this->validationGroups]), new Type(['type' => 'numeric', 'groups' => $this->validationGroups]), ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleActionChoiceType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleActionChoiceType.php index e098116dfb..0dfe4ce556 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleActionChoiceType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleActionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleChoiceType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleChoiceType.php index 4fcdda2d59..56d44423a1 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleChoiceType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleChoiceType.php @@ -1,17 +1,20 @@ 'name', 'choice_translation_domain' => false, 'active' => true, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleConditionChoiceType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleConditionChoiceType.php index e7cf83ced3..ebebef51c3 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleConditionChoiceType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleConditionChoiceType.php @@ -1,17 +1,20 @@ [ 'data-form-collection' => 'update', ], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleGroupCollectionType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleGroupCollectionType.php index cfa42d795e..dbfc82b592 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleGroupCollectionType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleGroupCollectionType.php @@ -1,17 +1,20 @@ add('priority', NumberType::class) ->add('stopPropagation', CheckboxType::class) ->add('shippingRule', ShippingRuleChoiceType::class) - ->add('carrier', CarrierChoiceType::class); + ->add('carrier', CarrierChoiceType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleType.php index 9f5f15b3fe..41f3201276 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingRuleType.php @@ -1,17 +1,20 @@ add('name', TextareaType::class) ->add('active', CheckboxType::class) ->add('conditions', ShippingRuleConditionCollectionType::class) - ->add('actions', ShippingRuleActionCollectionType::class); + ->add('actions', ShippingRuleActionCollectionType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingTaxCalculationStrategyChoiceType.php b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingTaxCalculationStrategyChoiceType.php index eba417b58d..a768919216 100644 --- a/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingTaxCalculationStrategyChoiceType.php +++ b/src/CoreShop/Bundle/ShippingBundle/Form/Type/ShippingTaxCalculationStrategyChoiceType.php @@ -1,17 +1,20 @@ createAddToStorageList($storageList, $item); $form = $this->formFactory->createNamed( - 'coreshop-'.$product->getId(), + 'coreshop-' . $product->getId(), $this->addToStorageListForm, - $addToStorageList + $addToStorageList, ); if ($request->isMethod('POST')) { @@ -139,7 +141,7 @@ public function addItemAction(Request $request): Response [ 'form' => $form->createView(), 'product' => $product, - ] + ], ); } @@ -209,12 +211,11 @@ public function summaryAction(Request $request): Response protected function createAddToStorageList( StorageListInterface $storageList, - StorageListItemInterface $storageListItem + StorageListItemInterface $storageListItem, ): AddToStorageListInterface { return $this->addToStorageListFactory->createWithStorageListAndStorageListItem($storageList, $storageListItem); } - /** * @return mixed * diff --git a/src/CoreShop/Bundle/StorageListBundle/Core/EventListener/SessionStoreStorageListSubscriber.php b/src/CoreShop/Bundle/StorageListBundle/Core/EventListener/SessionStoreStorageListSubscriber.php index e7bf4f7064..25ae18e6c2 100644 --- a/src/CoreShop/Bundle/StorageListBundle/Core/EventListener/SessionStoreStorageListSubscriber.php +++ b/src/CoreShop/Bundle/StorageListBundle/Core/EventListener/SessionStoreStorageListSubscriber.php @@ -1,17 +1,20 @@ set( sprintf('%s.%s', $this->sessionKeyName, $storageList->getStore()->getId()), - $storageList->getId() + $storageList->getId(), ); } } diff --git a/src/CoreShop/Bundle/StorageListBundle/Core/EventListener/StorageListBlamerListener.php b/src/CoreShop/Bundle/StorageListBundle/Core/EventListener/StorageListBlamerListener.php index 108c2975ef..7b2d251736 100644 --- a/src/CoreShop/Bundle/StorageListBundle/Core/EventListener/StorageListBlamerListener.php +++ b/src/CoreShop/Bundle/StorageListBundle/Core/EventListener/StorageListBlamerListener.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/StorageListBundle/DependencyInjection/CoreShopStorageListExtension.php b/src/CoreShop/Bundle/StorageListBundle/DependencyInjection/CoreShopStorageListExtension.php index 7cd5f616ab..ee85dd7f8c 100644 --- a/src/CoreShop/Bundle/StorageListBundle/DependencyInjection/CoreShopStorageListExtension.php +++ b/src/CoreShop/Bundle/StorageListBundle/DependencyInjection/CoreShopStorageListExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration($list['context']['interface']) - ->addTag($list['context']['tag']); + ->addTag($list['context']['tag']) + ; } $factoryContextDefinition = new Definition(StorageListFactoryContext::class); @@ -92,7 +96,7 @@ public function load(array $configs, ContainerBuilder $container): void $sessionSubscriber = new Definition(SessionSubscriber::class, [ new Reference(PimcoreContextResolver::class), new Reference($contextCompositeServiceName), - $list['session']['key'] + $list['session']['key'], ]); $container->setDefinition('coreshop.storage_list.session_subscriber.' . $name, $sessionSubscriber); @@ -102,8 +106,7 @@ public function load(array $configs, ContainerBuilder $container): void if ($container->has($class)) { $controllerDefinition = $container->getDefinition($class); - } - else { + } else { $controllerDefinition = new Definition($class); } @@ -153,22 +156,22 @@ public function load(array $configs, ContainerBuilder $container): void $storeBasedContextDefinition->setDecoratedService($contextCompositeServiceName); $storeBasedContextDefinition->setArgument( '$context', - new Reference('coreshop.storage_list.context.store_based.'.$name.'.inner') + new Reference('coreshop.storage_list.context.store_based.' . $name . '.inner'), ); $storeBasedContextDefinition->setArgument( '$shopperContext', - new Reference('coreshop.context.shopper') + new Reference('coreshop.context.shopper'), ); $container->setDefinition( - 'coreshop.storage_list.context.store_based.'.$name, - $storeBasedContextDefinition + 'coreshop.storage_list.context.store_based.' . $name, + $storeBasedContextDefinition, ); } if ($list['session']['enabled']) { $sessionAndStoreBasedContextDefinition = new Definition( - SessionAndStoreBasedStorageListContext::class + SessionAndStoreBasedStorageListContext::class, ); $sessionAndStoreBasedContextDefinition->setArgument('$requestStack', new Reference('request_stack')); $sessionAndStoreBasedContextDefinition->setArgument('$sessionKeyName', $list['session']['key']); @@ -199,7 +202,7 @@ public function load(array $configs, ContainerBuilder $container): void (new RegisterStorageListPass( $list['context']['interface'], $contextCompositeServiceName, - $list['context']['tag'] + $list['context']['tag'], ))->process($container); } } diff --git a/src/CoreShop/Bundle/StorageListBundle/EventListener/SessionSubscriber.php b/src/CoreShop/Bundle/StorageListBundle/EventListener/SessionSubscriber.php index fcf340445a..ed7699720f 100644 --- a/src/CoreShop/Bundle/StorageListBundle/EventListener/SessionSubscriber.php +++ b/src/CoreShop/Bundle/StorageListBundle/EventListener/SessionSubscriber.php @@ -1,17 +1,20 @@ set( sprintf('%s', $this->sessionKeyName), - $list->getId() + $list->getId(), ); } } diff --git a/src/CoreShop/Bundle/StorageListBundle/Form/Type/AddToStorageListType.php b/src/CoreShop/Bundle/StorageListBundle/Form/Type/AddToStorageListType.php index 9dbc1c2e4d..cae64debc0 100644 --- a/src/CoreShop/Bundle/StorageListBundle/Form/Type/AddToStorageListType.php +++ b/src/CoreShop/Bundle/StorageListBundle/Form/Type/AddToStorageListType.php @@ -1,17 +1,20 @@ false, 'label' => 'coreshop.form.storage_list.items', ]) - ->add('submit', SubmitType::class); + ->add('submit', SubmitType::class) + ; } public function configureOptions(OptionsResolver $resolver): void @@ -49,4 +53,3 @@ public function getBlockPrefix(): string return 'coreshop_storage_list'; } } - diff --git a/src/CoreShop/Bundle/StorageListBundle/Pimcore/Repository/PimcoreStorageListRepository.php b/src/CoreShop/Bundle/StorageListBundle/Pimcore/Repository/PimcoreStorageListRepository.php index 8b9270eff1..a8e941630b 100644 --- a/src/CoreShop/Bundle/StorageListBundle/Pimcore/Repository/PimcoreStorageListRepository.php +++ b/src/CoreShop/Bundle/StorageListBundle/Pimcore/Repository/PimcoreStorageListRepository.php @@ -1,17 +1,20 @@ data = [ 'store' => null, diff --git a/src/CoreShop/Bundle/StoreBundle/Context/Debug/DebugStoreContext.php b/src/CoreShop/Bundle/StoreBundle/Context/Debug/DebugStoreContext.php index 86eef43488..71d00742fd 100644 --- a/src/CoreShop/Bundle/StoreBundle/Context/Debug/DebugStoreContext.php +++ b/src/CoreShop/Bundle/StoreBundle/Context/Debug/DebugStoreContext.php @@ -1,17 +1,20 @@ repository->getAll(); - foreach($stores as $store) { + foreach ($stores as $store) { $options[] = [ 'key' => $store->getName(), - 'value' => $store->getId() + 'value' => $store->getId(), ]; } @@ -43,9 +50,9 @@ public function getOptions($context, $fieldDefinition) /** * Returns the value which is defined in the 'Default value' field + * * @param array $context * @param Data $fieldDefinition - * @return null */ public function getDefaultValue($context, $fieldDefinition) { @@ -55,10 +62,11 @@ public function getDefaultValue($context, $fieldDefinition) /** * @param array $context * @param Data $fieldDefinition + * * @return bool */ public function hasStaticOptions($context, $fieldDefinition) { return true; } -} \ No newline at end of file +} diff --git a/src/CoreShop/Bundle/StoreBundle/CoreShopStoreBundle.php b/src/CoreShop/Bundle/StoreBundle/CoreShopStoreBundle.php index 262d69c8b0..d5c8919d1b 100644 --- a/src/CoreShop/Bundle/StoreBundle/CoreShopStoreBundle.php +++ b/src/CoreShop/Bundle/StoreBundle/CoreShopStoreBundle.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -96,6 +100,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/StoreBundle/DependencyInjection/CoreShopStoreExtension.php b/src/CoreShop/Bundle/StoreBundle/DependencyInjection/CoreShopStoreExtension.php index 0c9da0cb42..f5972040b3 100644 --- a/src/CoreShop/Bundle/StoreBundle/DependencyInjection/CoreShopStoreExtension.php +++ b/src/CoreShop/Bundle/StoreBundle/DependencyInjection/CoreShopStoreExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(StoreContextInterface::class) - ->addTag(CompositeStoreContextPass::STORE_CONTEXT_TAG); + ->addTag(CompositeStoreContextPass::STORE_CONTEXT_TAG) + ; $container ->registerForAutoconfiguration(RequestResolverInterface::class) - ->addTag(CompositeRequestResolverPass::STORE_REQUEST_RESOLVER_TAG); + ->addTag(CompositeRequestResolverPass::STORE_REQUEST_RESOLVER_TAG) + ; } } diff --git a/src/CoreShop/Bundle/StoreBundle/Doctrine/ORM/StoreRepository.php b/src/CoreShop/Bundle/StoreBundle/Doctrine/ORM/StoreRepository.php index 9a911a6ec9..1410027e0c 100644 --- a/src/CoreShop/Bundle/StoreBundle/Doctrine/ORM/StoreRepository.php +++ b/src/CoreShop/Bundle/StoreBundle/Doctrine/ORM/StoreRepository.php @@ -1,17 +1,20 @@ andWhere('o.siteId = :siteId') ->setParameter('siteId', $siteId) ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } public function findStandard(): ?StoreInterface @@ -40,6 +44,7 @@ public function findStandard(): ?StoreInterface return $this->createQueryBuilder('o') ->andWhere('o.isDefault = 1') ->getQuery() - ->getOneOrNullResult(); + ->getOneOrNullResult() + ; } } diff --git a/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreChoiceType.php b/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreChoiceType.php index a59a9af783..e258b8e350 100644 --- a/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreChoiceType.php +++ b/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreChoiceType.php @@ -1,17 +1,20 @@ 'id', 'choice_label' => 'name', 'choice_translation_domain' => false, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreType.php b/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreType.php index a214afbf11..923c0dcb9f 100644 --- a/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreType.php +++ b/src/CoreShop/Bundle/StoreBundle/Form/Type/StoreType.php @@ -1,17 +1,20 @@ add('name', TextType::class) ->add('template', TextType::class) ->add('siteId', IntegerType::class) - ->add('currency', CurrencyChoiceType::class); + ->add('currency', CurrencyChoiceType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/StoreBundle/Helper/PimcoreSiteHelper.php b/src/CoreShop/Bundle/StoreBundle/Helper/PimcoreSiteHelper.php index 4431d853c5..38eeb89a8f 100644 --- a/src/CoreShop/Bundle/StoreBundle/Helper/PimcoreSiteHelper.php +++ b/src/CoreShop/Bundle/StoreBundle/Helper/PimcoreSiteHelper.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -183,6 +187,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/TaxationBundle/DependencyInjection/CoreShopTaxationExtension.php b/src/CoreShop/Bundle/TaxationBundle/DependencyInjection/CoreShopTaxationExtension.php index 5831fcd7fe..65e8c2911a 100644 --- a/src/CoreShop/Bundle/TaxationBundle/DependencyInjection/CoreShopTaxationExtension.php +++ b/src/CoreShop/Bundle/TaxationBundle/DependencyInjection/CoreShopTaxationExtension.php @@ -1,17 +1,20 @@ setParameter('name', $name) ->setParameter('locale', $locale) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/TaxationBundle/Doctrine/ORM/TaxRuleRepository.php b/src/CoreShop/Bundle/TaxationBundle/Doctrine/ORM/TaxRuleRepository.php index 7099389c2e..c2d461d2a9 100644 --- a/src/CoreShop/Bundle/TaxationBundle/Doctrine/ORM/TaxRuleRepository.php +++ b/src/CoreShop/Bundle/TaxationBundle/Doctrine/ORM/TaxRuleRepository.php @@ -1,17 +1,20 @@ andWhere('o.taxRuleGroup = :taxRuleGroup') ->setParameter('taxRuleGroup', $group) ->getQuery() - ->getResult(); + ->getResult() + ; } } diff --git a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateChoiceType.php b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateChoiceType.php index efe4354040..457fbe283c 100644 --- a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateChoiceType.php +++ b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateChoiceType.php @@ -1,17 +1,20 @@ 'name', 'choice_translation_domain' => false, 'active' => true, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateTranslationType.php b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateTranslationType.php index c4addb58e8..7899ec8d1b 100644 --- a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateTranslationType.php +++ b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateTranslationType.php @@ -1,17 +1,20 @@ add('name', TextType::class); + ->add('name', TextType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateType.php b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateType.php index bff0170572..479f51409c 100644 --- a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateType.php +++ b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRateType.php @@ -1,17 +1,20 @@ TaxRateTranslationType::class, ]) ->add('rate', NumberType::class) - ->add('active', CheckboxType::class); + ->add('active', CheckboxType::class) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleGroupChoiceType.php b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleGroupChoiceType.php index 85b8fb3147..c69ca8e846 100644 --- a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleGroupChoiceType.php +++ b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleGroupChoiceType.php @@ -1,17 +1,20 @@ 'id', 'choice_label' => 'name', 'choice_translation_domain' => false, - ]); + ]) + ; } public function getParent(): string diff --git a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleGroupType.php b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleGroupType.php index 0df7610255..76775b1641 100644 --- a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleGroupType.php +++ b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleGroupType.php @@ -1,17 +1,20 @@ true, 'allow_delete' => true, 'by_reference' => false, - ] - ); + ], + ) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleType.php b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleType.php index 2236de3f06..68a71cd11c 100644 --- a/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleType.php +++ b/src/CoreShop/Bundle/TaxationBundle/Form/Type/TaxRuleType.php @@ -1,17 +1,20 @@ 2, ], 'choice_translation_domain' => false, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/TaxationBundle/Resources/public/pimcore/css/taxation.css b/src/CoreShop/Bundle/TaxationBundle/Resources/public/pimcore/css/taxation.css index d394a8f6c3..3db55cf2d0 100644 --- a/src/CoreShop/Bundle/TaxationBundle/Resources/public/pimcore/css/taxation.css +++ b/src/CoreShop/Bundle/TaxationBundle/Resources/public/pimcore/css/taxation.css @@ -1,13 +1,17 @@ -/** - * CoreShop. +/* + * CoreShop * - * This source file is subject to the GNU General Public License version 3 (GPLv3) - * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt - * files that are distributed with this source code. + * This source file is available under two different licenses: + * - GNU General Public License version 3 (GPLv3) + * - CoreShop Commercial License (CCL) + * Full copyright and license information is available in + * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org) * @license https://www.coreshop.org/license GPLv3 and CCL + * */ + .coreshop_icon_taxes, .coreshop_icon_tax_rate, .pimcore_icon_coreShopTaxRate { background: url(../img/taxes.svg) center center no-repeat !important; } diff --git a/src/CoreShop/Bundle/TestBundle/CoreShopTestBundle.php b/src/CoreShop/Bundle/TestBundle/CoreShopTestBundle.php index f6f7c11d82..8882d660a4 100644 --- a/src/CoreShop/Bundle/TestBundle/CoreShopTestBundle.php +++ b/src/CoreShop/Bundle/TestBundle/CoreShopTestBundle.php @@ -1,17 +1,20 @@ booleanNode('pimcore_document_property')->defaultFalse()->end() ->end() ->end() - ->end(); + ->end() + ; return $treeBuilder; } diff --git a/src/CoreShop/Bundle/ThemeBundle/DependencyInjection/CoreShopThemeExtension.php b/src/CoreShop/Bundle/ThemeBundle/DependencyInjection/CoreShopThemeExtension.php index 2ccd7792ca..9fd3bbf455 100644 --- a/src/CoreShop/Bundle/ThemeBundle/DependencyInjection/CoreShopThemeExtension.php +++ b/src/CoreShop/Bundle/ThemeBundle/DependencyInjection/CoreShopThemeExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(ThemeResolverInterface::class) - ->addTag(CompositeThemeResolverPass::THEME_RESOLVER_TAG); + ->addTag(CompositeThemeResolverPass::THEME_RESOLVER_TAG) + ; } } diff --git a/src/CoreShop/Bundle/ThemeBundle/EventListener/DocumentRenderListener.php b/src/CoreShop/Bundle/ThemeBundle/EventListener/DocumentRenderListener.php index cda17adf90..fac76f953c 100644 --- a/src/CoreShop/Bundle/ThemeBundle/EventListener/DocumentRenderListener.php +++ b/src/CoreShop/Bundle/ThemeBundle/EventListener/DocumentRenderListener.php @@ -1,17 +1,20 @@ themeContext->setTheme($theme); - } - catch (ThemeNotResolvedException) { + } catch (ThemeNotResolvedException) { //Ignore } } diff --git a/src/CoreShop/Bundle/ThemeBundle/Service/CompositeThemeResolver.php b/src/CoreShop/Bundle/ThemeBundle/Service/CompositeThemeResolver.php index f2f29f953e..1ecb7d1fd2 100644 --- a/src/CoreShop/Bundle/ThemeBundle/Service/CompositeThemeResolver.php +++ b/src/CoreShop/Bundle/ThemeBundle/Service/CompositeThemeResolver.php @@ -1,17 +1,20 @@ request->get('documentId'); if ($documentId) { - $document = Document::getById((int)$documentId); + $document = Document::getById((int) $documentId); } - } - else { + } else { $document = $this->documentResolver->getDocument($request); } diff --git a/src/CoreShop/Bundle/ThemeBundle/Service/PimcoreSiteThemeResolver.php b/src/CoreShop/Bundle/ThemeBundle/Service/PimcoreSiteThemeResolver.php index 33c99da3bc..d2b180141b 100644 --- a/src/CoreShop/Bundle/ThemeBundle/Service/PimcoreSiteThemeResolver.php +++ b/src/CoreShop/Bundle/ThemeBundle/Service/PimcoreSiteThemeResolver.php @@ -1,17 +1,20 @@ requestStack->getMainRequest(); @@ -43,10 +45,9 @@ public function resolveTheme(): string $documentId = $request->request->get('documentId'); if ($documentId) { - $document = Document::getById((int)$documentId); + $document = Document::getById((int) $documentId); } - } - else { + } else { $document = $this->documentResolver->getDocument($request); } diff --git a/src/CoreShop/Bundle/ThemeBundle/Service/ThemeHelper.php b/src/CoreShop/Bundle/ThemeBundle/Service/ThemeHelper.php index 8a29a41dc8..8cf94ebcb6 100644 --- a/src/CoreShop/Bundle/ThemeBundle/Service/ThemeHelper.php +++ b/src/CoreShop/Bundle/ThemeBundle/Service/ThemeHelper.php @@ -1,17 +1,20 @@ end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/TrackingBundle/DependencyInjection/CoreShopTrackingExtension.php b/src/CoreShop/Bundle/TrackingBundle/DependencyInjection/CoreShopTrackingExtension.php index f4978cfd89..eb7034b11b 100644 --- a/src/CoreShop/Bundle/TrackingBundle/DependencyInjection/CoreShopTrackingExtension.php +++ b/src/CoreShop/Bundle/TrackingBundle/DependencyInjection/CoreShopTrackingExtension.php @@ -1,17 +1,20 @@ registerForAutoconfiguration(TrackerInterface::class) - ->addTag(TrackerPass::TRACKER_TAG); + ->addTag(TrackerPass::TRACKER_TAG) + ; $container ->registerForAutoconfiguration(TrackingExtractorInterface::class) - ->addTag(TrackingExtractorPass::TRACKING_EXTRACTOR_TAG); + ->addTag(TrackingExtractorPass::TRACKING_EXTRACTOR_TAG) + ; } protected function configureTrackers(array $configs, ContainerBuilder $container): void @@ -54,10 +59,12 @@ protected function configureTrackers(array $configs, ContainerBuilder $container if (!array_key_exists($type, $configs['trackers'])) { $container->getDefinition($id) - ->addMethodCall('setEnabled', [false]); + ->addMethodCall('setEnabled', [false]) + ; } else { $container->getDefinition($id) - ->addMethodCall('setEnabled', [$configs['trackers'][$type]['enabled']]); + ->addMethodCall('setEnabled', [$configs['trackers'][$type]['enabled']]) + ; } } } diff --git a/src/CoreShop/Bundle/TrackingBundle/EventListener/GtmDataLayerBlockListener.php b/src/CoreShop/Bundle/TrackingBundle/EventListener/GtmDataLayerBlockListener.php index a459d9ec5a..49ec184c33 100644 --- a/src/CoreShop/Bundle/TrackingBundle/EventListener/GtmDataLayerBlockListener.php +++ b/src/CoreShop/Bundle/TrackingBundle/EventListener/GtmDataLayerBlockListener.php @@ -1,17 +1,20 @@ configureOptions($resolver); @@ -57,7 +60,7 @@ protected function configureOptions(OptionsResolver $resolver): void $resolver->setDefaults( [ 'template_extension' => 'twig', - ] + ], ); $resolver->setAllowedTypes('template_prefix', 'string'); @@ -70,7 +73,7 @@ protected function getTemplatePath(string $name): string '%s/%s.js.%s', $this->templatePrefix, $name, - $this->templateExtension + $this->templateExtension, ); } @@ -78,7 +81,7 @@ protected function renderTemplate(string $name, array $parameters): string { return $this->twig->render( $this->getTemplatePath($name), - $parameters + $parameters, ); } diff --git a/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/AnalyticsEnhancedEcommerce.php b/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/AnalyticsEnhancedEcommerce.php index 3aff4bd303..36c468c76b 100644 --- a/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/AnalyticsEnhancedEcommerce.php +++ b/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/AnalyticsEnhancedEcommerce.php @@ -1,17 +1,20 @@ get('gtagcode'); + return (bool) $config->get('gtagcode'); } } diff --git a/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/GlobalSiteTagEnhancedEcommerce.php b/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/GlobalSiteTagEnhancedEcommerce.php index a4e7670f55..db607ed79b 100644 --- a/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/GlobalSiteTagEnhancedEcommerce.php +++ b/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/GlobalSiteTagEnhancedEcommerce.php @@ -1,17 +1,20 @@ get('gtagcode'); + return (bool) $config->get('gtagcode'); } } diff --git a/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/TagManager/CodeTracker.php b/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/TagManager/CodeTracker.php index c4d78b02a1..16004a4a7d 100644 --- a/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/TagManager/CodeTracker.php +++ b/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/TagManager/CodeTracker.php @@ -1,17 +1,20 @@ get('gtagcode'); + return (bool) $config->get('gtagcode'); } protected function transformOrder(array $actionData): array diff --git a/src/CoreShop/Bundle/UserBundle/CoreShopUserBundle.php b/src/CoreShop/Bundle/UserBundle/CoreShopUserBundle.php index 882b34b160..63870cd169 100644 --- a/src/CoreShop/Bundle/UserBundle/CoreShopUserBundle.php +++ b/src/CoreShop/Bundle/UserBundle/CoreShopUserBundle.php @@ -1,17 +1,20 @@ children() ->scalarNode('driver')->defaultValue(CoreShopResourceBundle::DRIVER_DOCTRINE_ORM)->end() - ->end(); + ->end() + ; $this->addStack($rootNode); $this->addModelsSection($rootNode); @@ -69,7 +73,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addStack(ArrayNodeDefinition $node): void @@ -81,7 +86,8 @@ private function addStack(ArrayNodeDefinition $node): void ->scalarNode('user')->defaultValue(UserInterface::class)->cannotBeEmpty()->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -108,6 +114,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/UserBundle/DependencyInjection/CoreShopUserExtension.php b/src/CoreShop/Bundle/UserBundle/DependencyInjection/CoreShopUserExtension.php index 80bb44c3f1..4d08c95d47 100644 --- a/src/CoreShop/Bundle/UserBundle/DependencyInjection/CoreShopUserExtension.php +++ b/src/CoreShop/Bundle/UserBundle/DependencyInjection/CoreShopUserExtension.php @@ -1,17 +1,20 @@ 'coreshop.form.user.password.must_match', 'first_options' => ['label' => 'coreshop.form.user.new_password'], 'second_options' => ['label' => 'coreshop.form.user.new_password_repeat'], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/UserBundle/Form/Type/RequestResetPasswordType.php b/src/CoreShop/Bundle/UserBundle/Form/Type/RequestResetPasswordType.php index d015048c66..49ec6804c2 100644 --- a/src/CoreShop/Bundle/UserBundle/Form/Type/RequestResetPasswordType.php +++ b/src/CoreShop/Bundle/UserBundle/Form/Type/RequestResetPasswordType.php @@ -1,17 +1,20 @@ add($identifier, $typeClass, [ 'label' => sprintf('coreshop.form.customer.%s', $identifier), 'constraints' => [ - new NotBlank() + new NotBlank(), ], ]); } diff --git a/src/CoreShop/Bundle/UserBundle/Form/Type/ResetPasswordType.php b/src/CoreShop/Bundle/UserBundle/Form/Type/ResetPasswordType.php index c23fa87e03..e4ddeacb3f 100644 --- a/src/CoreShop/Bundle/UserBundle/Form/Type/ResetPasswordType.php +++ b/src/CoreShop/Bundle/UserBundle/Form/Type/ResetPasswordType.php @@ -1,17 +1,20 @@ PasswordType::class, 'first_options' => ['label' => 'coreshop.form.user.password'], 'second_options' => ['label' => 'coreshop.form.user.password_repeat'], - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/UserBundle/Form/Type/UserLoginType.php b/src/CoreShop/Bundle/UserBundle/Form/Type/UserLoginType.php index 67c13f2704..ab42a2b59e 100644 --- a/src/CoreShop/Bundle/UserBundle/Form/Type/UserLoginType.php +++ b/src/CoreShop/Bundle/UserBundle/Form/Type/UserLoginType.php @@ -1,17 +1,20 @@ add('_remember_me', CheckboxType::class, [ 'label' => 'coreshop.form.login.remember_me', 'required' => false, - ]); + ]) + ; } public function getBlockPrefix(): string diff --git a/src/CoreShop/Bundle/UserBundle/Pimcore/Repository/UserRepository.php b/src/CoreShop/Bundle/UserBundle/Pimcore/Repository/UserRepository.php index dc1cccb478..c6e8314385 100644 --- a/src/CoreShop/Bundle/UserBundle/Pimcore/Repository/UserRepository.php +++ b/src/CoreShop/Bundle/UserBundle/Pimcore/Repository/UserRepository.php @@ -1,17 +1,20 @@ children() ->scalarNode('redirect_to_main_variant')->defaultTrue() - ->end(); + ->end() + ; return $treeBuilder; } @@ -55,7 +59,8 @@ private function addStack(ArrayNodeDefinition $node): void ->scalarNode('attribute')->defaultValue(AttributeInterface::class)->cannotBeEmpty()->end() ->end() ->end() - ->end(); + ->end() + ; } private function addModelsSection(ArrayNodeDefinition $node): void @@ -118,7 +123,8 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void @@ -145,6 +151,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/VariantBundle/DependencyInjection/CoreShopVariantExtension.php b/src/CoreShop/Bundle/VariantBundle/DependencyInjection/CoreShopVariantExtension.php index 7d64e65ccc..3278418f8c 100644 --- a/src/CoreShop/Bundle/VariantBundle/DependencyInjection/CoreShopVariantExtension.php +++ b/src/CoreShop/Bundle/VariantBundle/DependencyInjection/CoreShopVariantExtension.php @@ -1,17 +1,20 @@ processConfiguration($this->getConfiguration([], $container), $configs); - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); //$this->registerResources('coreshop', CoreShopResourceBundle::DRIVER_DOCTRINE_ORM, $config['resources'], $container); $this->registerPimcoreModels('coreshop', $configs['pimcore'], $container); diff --git a/src/CoreShop/Bundle/VariantBundle/EventListener/AttributeListener.php b/src/CoreShop/Bundle/VariantBundle/EventListener/AttributeListener.php index d0e1493cd9..9e0fad9d90 100644 --- a/src/CoreShop/Bundle/VariantBundle/EventListener/AttributeListener.php +++ b/src/CoreShop/Bundle/VariantBundle/EventListener/AttributeListener.php @@ -1,17 +1,20 @@ setAttributeGroup($parent); + break; } - - } while($parent != null); + } while ($parent != null); $this->validate($object); } @@ -71,13 +76,13 @@ private function validate(AttributeInterface $object) if (count($result) > 0) { $validationExceptions[] = new NiceValidationException(implode( - PHP_EOL, + \PHP_EOL, array_map(static function (ConstraintViolationInterface $violation) { return $violation->getMessage(); - }, iterator_to_array($result)) + }, iterator_to_array($result)), )); - throw new ValidationException(implode(PHP_EOL, array_map(static function (ValidationException $exception) { return $exception->getMessage(); }, $validationExceptions))); + throw new ValidationException(implode(\PHP_EOL, array_map(static function (ValidationException $exception) { return $exception->getMessage(); }, $validationExceptions))); } } } diff --git a/src/CoreShop/Bundle/VariantBundle/EventListener/MainVariantListener.php b/src/CoreShop/Bundle/VariantBundle/EventListener/MainVariantListener.php index 54f4f87153..0650f503c9 100644 --- a/src/CoreShop/Bundle/VariantBundle/EventListener/MainVariantListener.php +++ b/src/CoreShop/Bundle/VariantBundle/EventListener/MainVariantListener.php @@ -1,17 +1,20 @@ getObject(); @@ -75,7 +81,7 @@ public function preUpdate(DataObjectEvent $dataObjectEvent): void $name = sprintf( '%s %s', $parent->getName($language), - implode(' ', array_map(static fn(AttributeInterface $a) => $a->getName($language), $object->getAttributes())) + implode(' ', array_map(static fn (AttributeInterface $a) => $a->getName($language), $object->getAttributes())), ); $object->setName($name, $language); } @@ -90,13 +96,13 @@ private function validate(ProductVariantAwareInterface $object) if (count($result) > 0) { $validationExceptions[] = new NiceValidationException(implode( - PHP_EOL, + \PHP_EOL, array_map(static function (ConstraintViolationInterface $violation) { return $violation->getMessage(); - }, iterator_to_array($result)) + }, iterator_to_array($result)), )); - throw new ValidationException(implode(PHP_EOL, array_map(static function (ValidationException $exception) { + throw new ValidationException(implode(\PHP_EOL, array_map(static function (ValidationException $exception) { return $exception->getMessage(); }, $validationExceptions))); } diff --git a/src/CoreShop/Bundle/VariantBundle/Pimcore/VariantLinkGenerator.php b/src/CoreShop/Bundle/VariantBundle/Pimcore/VariantLinkGenerator.php index a8e803681e..d23f612bbf 100644 --- a/src/CoreShop/Bundle/VariantBundle/Pimcore/VariantLinkGenerator.php +++ b/src/CoreShop/Bundle/VariantBundle/Pimcore/VariantLinkGenerator.php @@ -1,17 +1,20 @@ inner->generate($mainVariant, $params); } -} \ No newline at end of file +} diff --git a/src/CoreShop/Bundle/VariantBundle/Twig/Extension/VariantExtension.php b/src/CoreShop/Bundle/VariantBundle/Twig/Extension/VariantExtension.php index 79d9e87192..1eb1a314b1 100644 --- a/src/CoreShop/Bundle/VariantBundle/Twig/Extension/VariantExtension.php +++ b/src/CoreShop/Bundle/VariantBundle/Twig/Extension/VariantExtension.php @@ -1,17 +1,20 @@ getAttributeGroup(); @@ -49,16 +52,18 @@ public function validate($value, Constraint $constraint): void } $concreteListing = new DataObject\Listing(); - $concreteListing->setCondition('o_path LIKE \''.$parent->getFullPath().'/%\''); + $concreteListing->setCondition('o_path LIKE \'' . $parent->getFullPath() . '/%\''); foreach ($concreteListing as $child) { if (!$child instanceof AttributeInterface) { continue; } - + if (!$value instanceof $child) { $this->context->buildViolation($constraint->message) - ->addViolation(); + ->addViolation() + ; + break; } } diff --git a/src/CoreShop/Bundle/VariantBundle/Validator/Constraints/ValidAttributesValidator.php b/src/CoreShop/Bundle/VariantBundle/Validator/Constraints/ValidAttributesValidator.php index 5becaed078..459ee0b33c 100644 --- a/src/CoreShop/Bundle/VariantBundle/Validator/Constraints/ValidAttributesValidator.php +++ b/src/CoreShop/Bundle/VariantBundle/Validator/Constraints/ValidAttributesValidator.php @@ -1,15 +1,4 @@ scalarNode('wishlist_product')->defaultValue(WishlistProductInterface::class)->cannotBeEmpty()->end() ->end() ->end() - ->end(); + ->end() + ; } private function addModelsSection(ArrayNodeDefinition $node): void @@ -94,6 +111,7 @@ private function addModelsSection(ArrayNodeDefinition $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/WishlistBundle/DependencyInjection/CoreShopWishlistExtension.php b/src/CoreShop/Bundle/WishlistBundle/DependencyInjection/CoreShopWishlistExtension.php index 30e43a5e10..a5bf12b1ca 100644 --- a/src/CoreShop/Bundle/WishlistBundle/DependencyInjection/CoreShopWishlistExtension.php +++ b/src/CoreShop/Bundle/WishlistBundle/DependencyInjection/CoreShopWishlistExtension.php @@ -1,17 +1,20 @@ false, 'label' => 'coreshop.form.wishlist.items', ]) - ->add('submit', SubmitType::class); + ->add('submit', SubmitType::class) + ; } public function configureOptions(OptionsResolver $resolver): void @@ -49,4 +53,3 @@ public function getBlockPrefix(): string return 'coreshop_wishlist'; } } - diff --git a/src/CoreShop/Bundle/WishlistBundle/Pimcore/Repository/WishlistItemRepository.php b/src/CoreShop/Bundle/WishlistBundle/Pimcore/Repository/WishlistItemRepository.php index 0e8d7c754b..caa5255a4c 100644 --- a/src/CoreShop/Bundle/WishlistBundle/Pimcore/Repository/WishlistItemRepository.php +++ b/src/CoreShop/Bundle/WishlistBundle/Pimcore/Repository/WishlistItemRepository.php @@ -1,17 +1,20 @@ arrayNode('state_machine') ->useAttributeAsKey('name') ->arrayPrototype() - ->children(); + ->children() + ; $this->addStateMachineSection($smNode); $this->addColorSection($smNode); @@ -115,7 +119,8 @@ private function addStateMachineSection(NodeBuilder $node): void ->end() ->end() ->end() - ->end(); + ->end() + ; } private function addColorSection(NodeBuilder $node): void @@ -124,19 +129,22 @@ private function addColorSection(NodeBuilder $node): void ->arrayNode('place_colors') ->useAttributeAsKey('name') ->prototype('scalar')->end() - ->end(); + ->end() + ; $node ->arrayNode('transition_colors') ->useAttributeAsKey('name') ->prototype('scalar')->end() - ->end(); + ->end() + ; } private function addCallBackSection(NodeBuilder $node): void { $callbacks = $node - ->arrayNode('callbacks'); + ->arrayNode('callbacks') + ; $this->addSubCallbackSection($callbacks, 'guard'); $this->addSubCallbackSection($callbacks, 'before'); @@ -161,6 +169,7 @@ private function addSubCallbackSection(ArrayNodeDefinition $callbacks, string $t ->end() ->end() ->end() - ->end(); + ->end() + ; } } diff --git a/src/CoreShop/Bundle/WorkflowBundle/DependencyInjection/CoreShopWorkflowExtension.php b/src/CoreShop/Bundle/WorkflowBundle/DependencyInjection/CoreShopWorkflowExtension.php index 43f151f0d9..e081a8bbad 100644 --- a/src/CoreShop/Bundle/WorkflowBundle/DependencyInjection/CoreShopWorkflowExtension.php +++ b/src/CoreShop/Bundle/WorkflowBundle/DependencyInjection/CoreShopWorkflowExtension.php @@ -1,17 +1,20 @@ allowedTransitions = $allowedTransitions; } diff --git a/src/CoreShop/Bundle/WorkflowBundle/EventListener/WorkflowListener.php b/src/CoreShop/Bundle/WorkflowBundle/EventListener/WorkflowListener.php index 3919e08341..2447823b11 100644 --- a/src/CoreShop/Bundle/WorkflowBundle/EventListener/WorkflowListener.php +++ b/src/CoreShop/Bundle/WorkflowBundle/EventListener/WorkflowListener.php @@ -1,17 +1,20 @@ $this->container, ]); }, - $callableArgs + $callableArgs, ); } diff --git a/src/CoreShop/Bundle/WorkflowBundle/History/HistoryLogger.php b/src/CoreShop/Bundle/WorkflowBundle/History/HistoryLogger.php index a889dc1e10..b1a9e69bc7 100644 --- a/src/CoreShop/Bundle/WorkflowBundle/History/HistoryLogger.php +++ b/src/CoreShop/Bundle/WorkflowBundle/History/HistoryLogger.php @@ -1,17 +1,20 @@ noteService->createPimcoreNoteInstance($object, $this->noteIdentifier); @@ -42,8 +48,8 @@ public function log( sprintf( '%s: %s', $this->translator->trans('coreshop_workflow_history_logger_prefix', [], 'admin'), - $message - ) + $message, + ), ); if (null !== $description) { diff --git a/src/CoreShop/Bundle/WorkflowBundle/History/HistoryLoggerInterface.php b/src/CoreShop/Bundle/WorkflowBundle/History/HistoryLoggerInterface.php index 78ce7b6997..824d3476ca 100644 --- a/src/CoreShop/Bundle/WorkflowBundle/History/HistoryLoggerInterface.php +++ b/src/CoreShop/Bundle/WorkflowBundle/History/HistoryLoggerInterface.php @@ -1,17 +1,20 @@ translator->trans('coreshop_workflow_state_changed_from', [], 'admin'), $this->translator->trans($fromValue, [], 'admin'), $this->translator->trans('coreshop_workflow_state_changed_to', [], 'admin'), - $this->translator->trans($toValue, [], 'admin') - ) + $this->translator->trans($toValue, [], 'admin'), + ), ); $note->addData('workflow', 'text', $event->getWorkflowName()); diff --git a/src/CoreShop/Bundle/WorkflowBundle/History/StateHistoryLoggerInterface.php b/src/CoreShop/Bundle/WorkflowBundle/History/StateHistoryLoggerInterface.php index a2907f0970..87f43f1e22 100644 --- a/src/CoreShop/Bundle/WorkflowBundle/History/StateHistoryLoggerInterface.php +++ b/src/CoreShop/Bundle/WorkflowBundle/History/StateHistoryLoggerInterface.php @@ -1,17 +1,20 @@ */ private PriorityQueue $countryContexts; diff --git a/src/CoreShop/Component/Address/Context/CountryContextInterface.php b/src/CoreShop/Component/Address/Context/CountryContextInterface.php index 29dacf72fd..8444702e9c 100644 --- a/src/CoreShop/Component/Address/Context/CountryContextInterface.php +++ b/src/CoreShop/Component/Address/Context/CountryContextInterface.php @@ -1,17 +1,20 @@ */ private PriorityQueue $requestResolvers; diff --git a/src/CoreShop/Component/Address/Context/RequestBased/CountryContext.php b/src/CoreShop/Component/Address/Context/RequestBased/CountryContext.php index a9b9061656..afd562822c 100644 --- a/src/CoreShop/Component/Address/Context/RequestBased/CountryContext.php +++ b/src/CoreShop/Component/Address/Context/RequestBased/CountryContext.php @@ -1,17 +1,20 @@ cache->load($cacheKey)) { - $country = $this->countryRepository->findByCode((string)$countryIsoCode); + $country = $this->countryRepository->findByCode((string) $countryIsoCode); if ($country instanceof CountryInterface) { return $country; diff --git a/src/CoreShop/Component/Address/Context/RequestBased/RequestResolverInterface.php b/src/CoreShop/Component/Address/Context/RequestBased/RequestResolverInterface.php index 7195871ddd..5775836634 100644 --- a/src/CoreShop/Component/Address/Context/RequestBased/RequestResolverInterface.php +++ b/src/CoreShop/Component/Address/Context/RequestBased/RequestResolverInterface.php @@ -1,17 +1,20 @@ getName(); + return (string) $this->getName(); } public function getId() diff --git a/src/CoreShop/Component/Address/Model/CountryInterface.php b/src/CoreShop/Component/Address/Model/CountryInterface.php index 4a5aed4ef8..b5b5a54205 100644 --- a/src/CoreShop/Component/Address/Model/CountryInterface.php +++ b/src/CoreShop/Component/Address/Model/CountryInterface.php @@ -1,17 +1,20 @@ getDiscount($cart, $configuration); @@ -49,7 +55,7 @@ public function applyRule( public function unApplyRule( OrderInterface $cart, array $configuration, - PriceRuleItemInterface $cartPriceRuleItem + PriceRuleItemInterface $cartPriceRuleItem, ): bool { return true; } @@ -74,7 +80,7 @@ protected function getDiscount(OrderInterface $cart, array $configuration): int return $this->moneyConverter->convert( $this->getApplicableAmount($cartAmount, $amount), $currency->getIsoCode(), - $cart->getCurrency()->getIsoCode() + $cart->getCurrency()->getIsoCode(), ); } diff --git a/src/CoreShop/Component/Core/Cart/Rule/Action/DiscountPercentActionProcessor.php b/src/CoreShop/Component/Core/Cart/Rule/Action/DiscountPercentActionProcessor.php index fd352b2c1b..bf142ffac4 100644 --- a/src/CoreShop/Component/Core/Cart/Rule/Action/DiscountPercentActionProcessor.php +++ b/src/CoreShop/Component/Core/Cart/Rule/Action/DiscountPercentActionProcessor.php @@ -1,17 +1,20 @@ getSubtotal($withTax); - $amount = (int)round(($configuration['percent'] / 100) * $total); + $amount = (int) round(($configuration['percent'] / 100) * $total); return $this->getApplicableAmount($amount, $amount); } diff --git a/src/CoreShop/Component/Core/Cart/Rule/Action/FreeShippingActionProcessor.php b/src/CoreShop/Component/Core/Cart/Rule/Action/FreeShippingActionProcessor.php index a8f872028f..ce1089947b 100644 --- a/src/CoreShop/Component/Core/Cart/Rule/Action/FreeShippingActionProcessor.php +++ b/src/CoreShop/Component/Core/Cart/Rule/Action/FreeShippingActionProcessor.php @@ -1,17 +1,20 @@ getCartPriceRule()->getName(), 0, 0, - true + true, ); $item->addAdjustment($adjustment); diff --git a/src/CoreShop/Component/Core/Cart/Rule/Action/SurchargeAmountActionProcessor.php b/src/CoreShop/Component/Core/Cart/Rule/Action/SurchargeAmountActionProcessor.php index b926901711..9721465f8f 100644 --- a/src/CoreShop/Component/Core/Cart/Rule/Action/SurchargeAmountActionProcessor.php +++ b/src/CoreShop/Component/Core/Cart/Rule/Action/SurchargeAmountActionProcessor.php @@ -1,17 +1,20 @@ getDiscount($cart, $configuration); @@ -48,7 +54,7 @@ public function applyRule( public function unApplyRule( OrderInterface $cart, array $configuration, - PriceRuleItemInterface $cartPriceRuleItem + PriceRuleItemInterface $cartPriceRuleItem, ): bool { return true; } @@ -66,7 +72,7 @@ protected function getDiscount(OrderInterface $cart, array $configuration): int return $this->moneyConverter->convert( $amount, $currency->getIsoCode(), - $cart->getCurrency()->getIsoCode() + $cart->getCurrency()->getIsoCode(), ); } } diff --git a/src/CoreShop/Component/Core/Cart/Rule/Action/SurchargePercentActionProcessor.php b/src/CoreShop/Component/Core/Cart/Rule/Action/SurchargePercentActionProcessor.php index d8331b9cd8..b6af589130 100644 --- a/src/CoreShop/Component/Core/Cart/Rule/Action/SurchargePercentActionProcessor.php +++ b/src/CoreShop/Component/Core/Cart/Rule/Action/SurchargePercentActionProcessor.php @@ -1,17 +1,20 @@ getSubtotal(false); - $amount = (int)round(($configuration['percent'] / 100) * $total); + $amount = (int) round(($configuration['percent'] / 100) * $total); return $this->getApplicableAmount($amount, $amount); } diff --git a/src/CoreShop/Component/Core/Cart/Rule/Action/VoucherCreditActionProcessor.php b/src/CoreShop/Component/Core/Cart/Rule/Action/VoucherCreditActionProcessor.php index b78866ae9f..e320f07335 100644 --- a/src/CoreShop/Component/Core/Cart/Rule/Action/VoucherCreditActionProcessor.php +++ b/src/CoreShop/Component/Core/Cart/Rule/Action/VoucherCreditActionProcessor.php @@ -1,17 +1,20 @@ getVoucherCode()) { return false; @@ -51,7 +57,7 @@ public function applyRule( $discount = $this->moneyConverter->convert( $discount, $voucherCode->getCreditCurrency()->getIsoCode(), - $cart->getCurrency()->getIsoCode() + $cart->getCurrency()->getIsoCode(), ); if ($discount <= 0) { @@ -66,7 +72,7 @@ public function applyRule( public function unApplyRule( OrderInterface $cart, array $configuration, - PriceRuleItemInterface $cartPriceRuleItem + PriceRuleItemInterface $cartPriceRuleItem, ): bool { return true; } diff --git a/src/CoreShop/Component/Core/Cart/Rule/Applier/CartRuleApplier.php b/src/CoreShop/Component/Core/Cart/Rule/Applier/CartRuleApplier.php index 04b8f02414..3c34226a10 100644 --- a/src/CoreShop/Component/Core/Cart/Rule/Applier/CartRuleApplier.php +++ b/src/CoreShop/Component/Core/Cart/Rule/Applier/CartRuleApplier.php @@ -1,17 +1,20 @@ getTotal(false); $totalDiscountPossible += $item->getTotal($withTax); } - + $discount = min($discount, $totalDiscountPossible); - + if (0 === $discount) { return; } @@ -93,7 +95,7 @@ protected function apply(OrderInterface $cart, PriceRuleItemInterface $cartPrice $taxCalculator = $this->taxCalculatorFactory->getTaxCalculator( $item->getProduct(), $cart->getShippingAddress() ?: $this->defaultAddressProvider->getAddress($cart), - $context + $context, ); if ($taxCalculator instanceof TaxCalculatorInterface) { @@ -119,9 +121,9 @@ protected function apply(OrderInterface $cart, PriceRuleItemInterface $cartPrice $totalDiscountGross += $itemDiscountGross; } - $totalDiscountNet = (int)round($totalDiscountNet); - $totalDiscountGross = (int)round($totalDiscountGross); - $totalDiscountFloat = (int)round($totalDiscountFloat); + $totalDiscountNet = (int) round($totalDiscountNet); + $totalDiscountGross = (int) round($totalDiscountGross); + $totalDiscountFloat = (int) round($totalDiscountFloat); //Add missing cents caused by rounding issues if ($totalDiscountFloat > ($withTax ? $totalDiscountNet : $totalDiscountGross)) { @@ -154,7 +156,7 @@ protected function apply(OrderInterface $cart, PriceRuleItemInterface $cartPrice $taxCalculator = $this->taxCalculatorFactory->getTaxCalculator( $item->getProduct(), $cart->getShippingAddress() ?: $this->defaultAddressProvider->getAddress($cart), - $context + $context, ); if ($taxCalculator instanceof TaxCalculatorInterface) { @@ -166,8 +168,8 @@ protected function apply(OrderInterface $cart, PriceRuleItemInterface $cartPrice $this->taxCollector->collectTaxesFromGross( $taxCalculator, ($positive ? $amountGross : -1 * $amountGross), - $taxItems->getItems() - ) + $taxItems->getItems(), + ), ); } else { /** @psalm-suppress InvalidArgument */ @@ -175,8 +177,8 @@ protected function apply(OrderInterface $cart, PriceRuleItemInterface $cartPrice $this->taxCollector->collectTaxes( $taxCalculator, ($positive ? $amountNet : -1 * $amountNet), - $taxItems->getItems() - ) + $taxItems->getItems(), + ), ); } } @@ -185,7 +187,7 @@ protected function apply(OrderInterface $cart, PriceRuleItemInterface $cartPrice AdjustmentInterface::CART_PRICE_RULE, $cartPriceRuleItem->getCartPriceRule()->getName(), $positive ? $amountGross : (-1 * $amountGross), - $positive ? $amountNet : (-1 * $amountNet) + $positive ? $amountNet : (-1 * $amountNet), )); } @@ -197,8 +199,8 @@ protected function apply(OrderInterface $cart, PriceRuleItemInterface $cartPrice AdjustmentInterface::CART_PRICE_RULE, $cartPriceRuleItem->getCartPriceRule()->getName(), $cartPriceRuleItem->getDiscount(true), - $cartPriceRuleItem->getDiscount(false) - ) + $cartPriceRuleItem->getDiscount(false), + ), ); } } diff --git a/src/CoreShop/Component/Core/Cart/Rule/Applier/CartRuleApplierInterface.php b/src/CoreShop/Component/Core/Cart/Rule/Applier/CartRuleApplierInterface.php index 99e8efb9ed..7bdbb3b750 100644 --- a/src/CoreShop/Component/Core/Cart/Rule/Applier/CartRuleApplierInterface.php +++ b/src/CoreShop/Component/Core/Cart/Rule/Applier/CartRuleApplierInterface.php @@ -1,17 +1,20 @@ getCategoriesToCheck( $configuration['categories'], $cart->getStore(), - $configuration['recursive'] ?: false + $configuration['recursive'] ?: false, ); foreach ($cart->getItems() as $item) { diff --git a/src/CoreShop/Component/Core/Cart/Rule/Condition/CountriesConditionChecker.php b/src/CoreShop/Component/Core/Cart/Rule/Condition/CountriesConditionChecker.php index 453559dbf7..f0b81304a6 100644 --- a/src/CoreShop/Component/Core/Cart/Rule/Condition/CountriesConditionChecker.php +++ b/src/CoreShop/Component/Core/Cart/Rule/Condition/CountriesConditionChecker.php @@ -1,17 +1,20 @@ getDiscount($orderItem, $configuration); @@ -53,7 +55,7 @@ public function applyRule( public function unApplyRule( OrderItemInterface $orderItem, array $configuration, - PriceRuleItemInterface $cartPriceRuleItem + PriceRuleItemInterface $cartPriceRuleItem, ): bool { return true; } @@ -78,7 +80,7 @@ protected function getDiscount(OrderItemInterface $orderItem, array $configurati return $this->moneyConverter->convert( $this->getApplicableAmount($cartAmount, $amount), $currency->getIsoCode(), - $orderItem->getOrder()->getCurrency()->getIsoCode() + $orderItem->getOrder()->getCurrency()->getIsoCode(), ); } diff --git a/src/CoreShop/Component/Core/CartItem/Rule/Action/DiscountPercentActionProcessor.php b/src/CoreShop/Component/Core/CartItem/Rule/Action/DiscountPercentActionProcessor.php index ca67e06e1e..03596b9568 100644 --- a/src/CoreShop/Component/Core/CartItem/Rule/Action/DiscountPercentActionProcessor.php +++ b/src/CoreShop/Component/Core/CartItem/Rule/Action/DiscountPercentActionProcessor.php @@ -1,17 +1,20 @@ getSubtotal($withTax); - $amount = (int)round(($configuration['percent'] / 100) * $total); + $amount = (int) round(($configuration['percent'] / 100) * $total); return $this->getApplicableAmount($amount, $amount); } diff --git a/src/CoreShop/Component/Core/CartItem/Rule/Applier/CartItemRuleApplier.php b/src/CoreShop/Component/Core/CartItem/Rule/Applier/CartItemRuleApplier.php index 37fbf6fea3..d27c610b29 100644 --- a/src/CoreShop/Component/Core/CartItem/Rule/Applier/CartItemRuleApplier.php +++ b/src/CoreShop/Component/Core/CartItem/Rule/Applier/CartItemRuleApplier.php @@ -1,17 +1,20 @@ apply($orderItem, $cartPriceRuleItem, $discount, $withTax, false); } @@ -49,7 +52,7 @@ public function applySurcharge( OrderItemInterface $orderItem, PriceRuleItemInterface $cartPriceRuleItem, int $discount, - bool $withTax = false + bool $withTax = false, ): void { $this->apply($orderItem, $cartPriceRuleItem, $discount, $withTax, true); } @@ -59,7 +62,7 @@ protected function apply( PriceRuleItemInterface $cartPriceRuleItem, int $discount, $withTax = false, - $positive = false + $positive = false, ): void { $order = $orderItem->getOrder(); $context = $this->cartContextResolver->resolveCartContext($order); @@ -90,7 +93,7 @@ protected function apply( $taxCalculator = $this->taxCalculatorFactory->getTaxCalculator( $orderItem->getProduct(), $order->getShippingAddress() ?: $this->defaultAddressProvider->getAddress($order), - $context + $context, ); if ($taxCalculator instanceof TaxCalculatorInterface) { @@ -111,9 +114,9 @@ protected function apply( } } - $itemDiscountNet = (int)round($itemDiscountNet); - $itemDiscountGross = (int)round($itemDiscountGross); - $discountFloat = (int)round($discountFloat); + $itemDiscountNet = (int) round($itemDiscountNet); + $itemDiscountGross = (int) round($itemDiscountGross); + $discountFloat = (int) round($discountFloat); //Add missing cents caused by rounding issues if ($discountFloat > ($withTax ? $itemDiscountNet : $itemDiscountGross)) { @@ -136,8 +139,8 @@ protected function apply( $this->taxCollector->collectTaxesFromGross( $taxCalculator, ($positive ? $amountGross : -1 * $amountGross), - $taxItems->getItems() - ) + $taxItems->getItems(), + ), ); } else { /** @psalm-suppress InvalidArgument */ @@ -145,8 +148,8 @@ protected function apply( $this->taxCollector->collectTaxes( $taxCalculator, ($positive ? $amountNet : -1 * $amountNet), - $taxItems->getItems() - ) + $taxItems->getItems(), + ), ); } } @@ -156,8 +159,8 @@ protected function apply( AdjustmentInterface::CART_PRICE_RULE, $cartPriceRuleItem->getCartPriceRule()->getName(), $positive ? $amountGross : (-1 * $amountGross), - $positive ? $amountNet : (-1 * $amountNet) - ) + $positive ? $amountNet : (-1 * $amountNet), + ), ); $cartPriceRuleItem->setDiscount($positive ? $itemDiscountNet : (-1 * $itemDiscountNet), false); diff --git a/src/CoreShop/Component/Core/CartItem/Rule/Applier/CartItemRuleApplierInterface.php b/src/CoreShop/Component/Core/CartItem/Rule/Applier/CartItemRuleApplierInterface.php index 3f72cf7cca..d9259e0cdb 100644 --- a/src/CoreShop/Component/Core/CartItem/Rule/Applier/CartItemRuleApplierInterface.php +++ b/src/CoreShop/Component/Core/CartItem/Rule/Applier/CartItemRuleApplierInterface.php @@ -1,17 +1,20 @@ getCategoriesToCheck( $configuration['categories'], $orderItem->getOrder()->getStore(), - $configuration['recursive'] ?: false + $configuration['recursive'] ?: false, ); $product = $orderItem->getProduct(); diff --git a/src/CoreShop/Component/Core/CartItem/Rule/Condition/ProductsConditionChecker.php b/src/CoreShop/Component/Core/CartItem/Rule/Condition/ProductsConditionChecker.php index 79ab786f41..cfe03192d8 100644 --- a/src/CoreShop/Component/Core/CartItem/Rule/Condition/ProductsConditionChecker.php +++ b/src/CoreShop/Component/Core/CartItem/Rule/Condition/ProductsConditionChecker.php @@ -1,17 +1,20 @@ getProductsToCheck( $configuration['products'], $orderItem->getOrder()->getStore(), - $configuration['include_variants'] ?: false + $configuration['include_variants'] ?: false, ); if ($orderItem->getIsGiftItem()) { diff --git a/src/CoreShop/Component/Core/Configuration/ConfigurationService.php b/src/CoreShop/Component/Core/Configuration/ConfigurationService.php index ae89f54d33..62c9a97aaa 100644 --- a/src/CoreShop/Component/Core/Configuration/ConfigurationService.php +++ b/src/CoreShop/Component/Core/Configuration/ConfigurationService.php @@ -1,17 +1,20 @@ getId(), $affiliation) + sprintf('Could not determine address path for customer with id %d with affiliation "%s"', $customer->getId(), $affiliation), ); } diff --git a/src/CoreShop/Component/Core/Customer/Address/AddressAssignmentManagerInterface.php b/src/CoreShop/Component/Core/Customer/Address/AddressAssignmentManagerInterface.php index cd9f883fd4..237059824a 100644 --- a/src/CoreShop/Component/Core/Customer/Address/AddressAssignmentManagerInterface.php +++ b/src/CoreShop/Component/Core/Customer/Address/AddressAssignmentManagerInterface.php @@ -1,17 +1,20 @@ folderCreationService->createFolderForResource( $address, - ['prefix' => $rootPath] + ['prefix' => $rootPath], ); } @@ -82,8 +87,8 @@ public function moveCustomerToNewCompany(CustomerInterface $customer, array $tra $company->setParent( $this->folderCreationService->createFolderForResource( $company, - ['suffix' => mb_strtoupper(mb_substr($customer->getLastname(), 0, 1))] - ) + ['suffix' => mb_strtoupper(mb_substr($customer->getLastname(), 0, 1))], + ), ); /** @psalm-suppress InternalMethod */ @@ -174,7 +179,7 @@ private function removeAddressRelations(AddressInterface $address): void $dependenciesObjects = []; /** @psalm-suppress InternalClass,InternalMethod */ - $dependenciesResult = Dependency::getBySourceId((int)$address->getId(), 'object'); + $dependenciesResult = Dependency::getBySourceId((int) $address->getId(), 'object'); /** @psalm-suppress InternalMethod */ foreach ($dependenciesResult->getRequiredBy() as $r) { @@ -245,6 +250,6 @@ private function forceSave(mixed $element, bool $useVersioning = true): void private function isNewEntity(ElementInterface $element): bool { - return is_null($element->getId()) || $element->getId() === 0; + return null === $element->getId() || $element->getId() === 0; } } diff --git a/src/CoreShop/Component/Core/Customer/CustomerTransformHelperInterface.php b/src/CoreShop/Component/Core/Customer/CustomerTransformHelperInterface.php index f297565ed7..15059ba164 100644 --- a/src/CoreShop/Component/Core/Customer/CustomerTransformHelperInterface.php +++ b/src/CoreShop/Component/Core/Customer/CustomerTransformHelperInterface.php @@ -1,17 +1,20 @@ getPaymentState(), [OrderPaymentStates::STATE_PAID, OrderPaymentStates::STATE_REFUNDED], - true + true, )) { $this->giveBack($order); @@ -56,7 +59,7 @@ public function hold(OrderInterface $order): void continue; } - $product->setOnHold($product->getOnHold() + (int)ceil($orderItem->getDefaultUnitQuantity())); + $product->setOnHold($product->getOnHold() + (int) ceil($orderItem->getDefaultUnitQuantity())); $this->productEntityManager->persist($product); } @@ -78,25 +81,25 @@ public function sell(OrderInterface $order): void } Assert::greaterThanEq( - ($product->getOnHold() - (int)ceil($orderItem->getDefaultUnitQuantity())), + ($product->getOnHold() - (int) ceil($orderItem->getDefaultUnitQuantity())), 0, sprintf( 'Not enough units to decrease on hold quantity from the inventory of a product "%s".', - $product->getName() - ) + $product->getName(), + ), ); Assert::greaterThanEq( - ($product->getOnHand() - (int)ceil($orderItem->getDefaultUnitQuantity())), + ($product->getOnHand() - (int) ceil($orderItem->getDefaultUnitQuantity())), 0, sprintf( 'Not enough units to decrease on hand quantity from the inventory of a product "%s".', - $product->getName() - ) + $product->getName(), + ), ); - $product->setOnHold($product->getOnHold() - (int)ceil($orderItem->getDefaultUnitQuantity())); - $product->setOnHand($product->getOnHand() - (int)ceil($orderItem->getDefaultUnitQuantity())); + $product->setOnHold($product->getOnHold() - (int) ceil($orderItem->getDefaultUnitQuantity())); + $product->setOnHand($product->getOnHand() - (int) ceil($orderItem->getDefaultUnitQuantity())); $this->productEntityManager->persist($product); } @@ -118,14 +121,14 @@ public function release(OrderInterface $order): void } Assert::greaterThanEq( - ($product->getOnHold() - (int)ceil($orderItem->getDefaultUnitQuantity())), + ($product->getOnHold() - (int) ceil($orderItem->getDefaultUnitQuantity())), 0, sprintf( 'Not enough units to decrease on hold quantity from the inventory of a product "%s".', - $product->getName() - ) + $product->getName(), + ), ); - $product->setOnHold($product->getOnHold() - (int)ceil($orderItem->getDefaultUnitQuantity())); + $product->setOnHold($product->getOnHold() - (int) ceil($orderItem->getDefaultUnitQuantity())); $this->productEntityManager->persist($product); } @@ -146,7 +149,7 @@ public function giveBack(OrderInterface $order): void continue; } - $product->setOnHand($product->getOnHand() + (int)ceil($orderItem->getDefaultUnitQuantity())); + $product->setOnHand($product->getOnHand() + (int) ceil($orderItem->getDefaultUnitQuantity())); $this->productEntityManager->persist($product); } diff --git a/src/CoreShop/Component/Core/Inventory/Operator/OrderInventoryOperatorInterface.php b/src/CoreShop/Component/Core/Inventory/Operator/OrderInventoryOperatorInterface.php index 15f15c9098..29ce62e584 100644 --- a/src/CoreShop/Component/Core/Inventory/Operator/OrderInventoryOperatorInterface.php +++ b/src/CoreShop/Component/Core/Inventory/Operator/OrderInventoryOperatorInterface.php @@ -1,17 +1,20 @@ getId()]; - $this->themeHelper->useTheme($store->getTemplate(), + $this->themeHelper->useTheme( + $store->getTemplate(), function () use ($subject, $rule, $subConfiguration, $params) { $this->mailActionProcessor->apply($subject, $rule, $subConfiguration, $params); - } + }, ); } } diff --git a/src/CoreShop/Component/Core/Notification/Rule/Action/Order/StoreOrderMailActionProcessor.php b/src/CoreShop/Component/Core/Notification/Rule/Action/Order/StoreOrderMailActionProcessor.php index 1bcadf0e85..536b4b6bae 100644 --- a/src/CoreShop/Component/Core/Notification/Rule/Action/Order/StoreOrderMailActionProcessor.php +++ b/src/CoreShop/Component/Core/Notification/Rule/Action/Order/StoreOrderMailActionProcessor.php @@ -1,17 +1,20 @@ objectCloner->cloneObject( $originalShippingAddress, $this->folderCreationService->createFolderForResource($originalShippingAddress, ['prefix' => $order->getFullPath()]), 'shipping', - false + false, ); /** * @var AddressInterface $invoiceAddress + * * @psalm-suppress InvalidArgument */ $invoiceAddress = $this->objectCloner->cloneObject( $order->getInvoiceAddress(), $this->folderCreationService->createFolderForResource($order->getInvoiceAddress(), ['prefix' => $order->getFullPath()]), 'invoice', - false + false, ); VersionHelper::useVersioning(function () use ($shippingAddress, $invoiceAddress) { diff --git a/src/CoreShop/Component/Core/Order/Committer/QuoteCommitter.php b/src/CoreShop/Component/Core/Order/Committer/QuoteCommitter.php index 2d43b37e72..54212a8924 100644 --- a/src/CoreShop/Component/Core/Order/Committer/QuoteCommitter.php +++ b/src/CoreShop/Component/Core/Order/Committer/QuoteCommitter.php @@ -1,17 +1,20 @@ objectCloner->cloneObject( $originalShippingAddress, $this->folderCreationService->createFolderForResource($originalShippingAddress, ['prefix' => $order->getFullPath()]), 'shipping', - false + false, ); /** * @var AddressInterface $invoiceAddress + * * @psalm-suppress InvalidArgument */ $invoiceAddress = $this->objectCloner->cloneObject( $order->getInvoiceAddress(), $this->folderCreationService->createFolderForResource($order->getInvoiceAddress(), ['prefix' => $order->getFullPath()]), 'invoice', - false + false, ); VersionHelper::useVersioning(function () use ($shippingAddress, $invoiceAddress) { diff --git a/src/CoreShop/Component/Core/Order/Modifier/CartItemQuantityModifier.php b/src/CoreShop/Component/Core/Order/Modifier/CartItemQuantityModifier.php index e6e1c9b06a..e9679320a3 100644 --- a/src/CoreShop/Component/Core/Order/Modifier/CartItemQuantityModifier.php +++ b/src/CoreShop/Component/Core/Order/Modifier/CartItemQuantityModifier.php @@ -1,17 +1,20 @@ setAmount( $this->convert($convertedAdjustment->getAmount(true), $cart), - $this->convert($convertedAdjustment->getAmount(false), $cart) + $this->convert($convertedAdjustment->getAmount(false), $cart), ); $item->addConvertedAdjustment($convertedAdjustment); @@ -94,7 +97,7 @@ public function process(OrderInterface $cart): void $convertedAdjustment = clone $adjustment; $convertedAdjustment->setAmount( $this->convert($convertedAdjustment->getAmount(true), $cart), - $this->convert($convertedAdjustment->getAmount(false), $cart) + $this->convert($convertedAdjustment->getAmount(false), $cart), ); $cart->addConvertedAdjustment($convertedAdjustment); @@ -132,7 +135,7 @@ private function convert(?int $value, OrderInterface $cart): int return $this->currencyConverter->convert( $value, $cart->getBaseCurrency()->getIsoCode(), - $cart->getCurrency()->getIsoCode() + $cart->getCurrency()->getIsoCode(), ); } } diff --git a/src/CoreShop/Component/Core/Order/Processor/CartItemProcessor.php b/src/CoreShop/Component/Core/Order/Processor/CartItemProcessor.php index af1a55ec9a..1e41883146 100644 --- a/src/CoreShop/Component/Core/Order/Processor/CartItemProcessor.php +++ b/src/CoreShop/Component/Core/Order/Processor/CartItemProcessor.php @@ -1,17 +1,20 @@ taxCalculator->getTaxCalculator( $product, $cart->getShippingAddress() ?: $this->defaultAddressProvider->getAddress($cart), - $context + $context, ); $quantity = $cartItem->getQuantity(); if ($taxCalculator instanceof TaxCalculatorInterface) { if ($store->getUseGrossPrice()) { - $totalTaxAmount = $taxCalculator->getTaxesAmountFromGross((int)round($itemPrice * $quantity)); - $totalTaxAmountArray = $taxCalculator->getTaxesAmountFromGrossAsArray((int)round($itemPrice * $quantity)); + $totalTaxAmount = $taxCalculator->getTaxesAmountFromGross((int) round($itemPrice * $quantity)); + $totalTaxAmountArray = $taxCalculator->getTaxesAmountFromGrossAsArray((int) round($itemPrice * $quantity)); $itemPriceTax = $taxCalculator->getTaxesAmountFromGross($itemPrice); $itemRetailPriceTaxAmount = $taxCalculator->getTaxesAmountFromGross($itemRetailPrice); $itemDiscountTax = $taxCalculator->getTaxesAmountFromGross($itemDiscount); @@ -70,7 +77,7 @@ public function processCartItem( $cartItem->setTaxes(new Fieldcollection($taxes)); - $cartItem->setSubtotal((int)round($itemPrice * $quantity), true); + $cartItem->setSubtotal((int) round($itemPrice * $quantity), true); $cartItem->setSubtotal($cartItem->getSubtotal(true) - $totalTaxAmount, false); $cartItem->setTotal($cartItem->getSubtotal(true), true); @@ -88,8 +95,8 @@ public function processCartItem( $cartItem->setItemDiscount($itemDiscount, true); $cartItem->setItemDiscount($itemDiscount - $itemDiscountTax, false); } else { - $totalTaxAmount = $taxCalculator->getTaxesAmount((int)round($itemPrice * $quantity)); - $totalTaxAmountArray = $taxCalculator->getTaxesAmountAsArray((int)round($itemPrice * $quantity)); + $totalTaxAmount = $taxCalculator->getTaxesAmount((int) round($itemPrice * $quantity)); + $totalTaxAmountArray = $taxCalculator->getTaxesAmountAsArray((int) round($itemPrice * $quantity)); $itemPriceTax = $taxCalculator->getTaxesAmount($itemPrice); $itemRetailPriceTaxAmount = $taxCalculator->getTaxesAmount($itemRetailPrice); $itemDiscountTax = $taxCalculator->getTaxesAmount($itemDiscount); @@ -98,8 +105,8 @@ public function processCartItem( $cartItem->setTaxes(new Fieldcollection($taxes)); - $cartItem->setSubtotal((int)round($itemPrice * $quantity), false); - $cartItem->setSubtotal((int)round($itemPrice * $quantity) + $totalTaxAmount, true); + $cartItem->setSubtotal((int) round($itemPrice * $quantity), false); + $cartItem->setSubtotal((int) round($itemPrice * $quantity) + $totalTaxAmount, true); $cartItem->setTotal($cartItem->getSubtotal(true), true); $cartItem->setTotal($cartItem->getSubtotal(false), false); @@ -117,8 +124,8 @@ public function processCartItem( $cartItem->setItemDiscount($itemDiscount + $itemDiscountTax, true); } } else { - $cartItem->setSubtotal((int)round($itemPrice * $quantity), false); - $cartItem->setSubtotal((int)round($itemPrice * $quantity), true); + $cartItem->setSubtotal((int) round($itemPrice * $quantity), false); + $cartItem->setSubtotal((int) round($itemPrice * $quantity), true); $cartItem->setTotal($cartItem->getSubtotal(true), true); $cartItem->setTotal($cartItem->getSubtotal(false), false); diff --git a/src/CoreShop/Component/Core/Order/Processor/CartItemsProcessor.php b/src/CoreShop/Component/Core/Order/Processor/CartItemsProcessor.php index cdf80b57c1..b686b2a29e 100644 --- a/src/CoreShop/Component/Core/Order/Processor/CartItemsProcessor.php +++ b/src/CoreShop/Component/Core/Order/Processor/CartItemsProcessor.php @@ -1,17 +1,20 @@ getItemQuantityFactor()) && $product->getItemQuantityFactor() > 1) { - $itemPrice = (int)round($itemPrice / $product->getItemQuantityFactor()); + $itemPrice = (int) round($itemPrice / $product->getItemQuantityFactor()); } if ($product instanceof QuantityRangePriceAwareInterface) { @@ -79,7 +86,7 @@ public function process(OrderInterface $cart): void $product, $item->getQuantity(), $itemPrice, - $context + $context, ); } catch (NoRuleFoundException) { } catch (NoPriceFoundException) { @@ -102,7 +109,7 @@ public function process(OrderInterface $cart): void } if ($item->getCustomItemDiscount() > 0) { - $itemPrice = (int)round((100 - $item->getCustomItemDiscount()) / 100 * $itemPrice); + $itemPrice = (int) round((100 - $item->getCustomItemDiscount()) / 100 * $itemPrice); } $this->cartItemProcessor->processCartItem( @@ -111,7 +118,7 @@ public function process(OrderInterface $cart): void $itemRetailPrice, $itemDiscountPrice, $itemDiscount, - $context + $context, ); $subtotalGross += $item->getTotal(true); diff --git a/src/CoreShop/Component/Core/Order/Processor/CartItemsWholesaleProcessor.php b/src/CoreShop/Component/Core/Order/Processor/CartItemsWholesaleProcessor.php index f31810d60a..b45aea7714 100644 --- a/src/CoreShop/Component/Core/Order/Processor/CartItemsWholesaleProcessor.php +++ b/src/CoreShop/Component/Core/Order/Processor/CartItemsWholesaleProcessor.php @@ -1,17 +1,20 @@ setItemWholesalePrice( - $this->wholesalePriceCalculator->getPurchasableWholesalePrice($product, $context) + $this->wholesalePriceCalculator->getPurchasableWholesalePrice($product, $context), ); } catch (NoPurchasableWholesalePriceFoundException) { $item->setItemWholesalePrice(0); diff --git a/src/CoreShop/Component/Core/Order/Processor/CartPaymentProcessor.php b/src/CoreShop/Component/Core/Order/Processor/CartPaymentProcessor.php index 940d9fa153..cda6db9b5c 100644 --- a/src/CoreShop/Component/Core/Order/Processor/CartPaymentProcessor.php +++ b/src/CoreShop/Component/Core/Order/Processor/CartPaymentProcessor.php @@ -1,17 +1,20 @@ setPaymentTotal( - (int)round((round($cart->getTotal() / $this->decimalFactor, $this->decimalPrecision) * 100), 0) + (int) round((round($cart->getTotal() / $this->decimalFactor, $this->decimalPrecision) * 100), 0), ); } } diff --git a/src/CoreShop/Component/Core/Order/Processor/CartPriceRuleVoucherProcessor.php b/src/CoreShop/Component/Core/Order/Processor/CartPriceRuleVoucherProcessor.php index 25ede19c95..40b23f763b 100644 --- a/src/CoreShop/Component/Core/Order/Processor/CartPriceRuleVoucherProcessor.php +++ b/src/CoreShop/Component/Core/Order/Processor/CartPriceRuleVoucherProcessor.php @@ -1,17 +1,20 @@ proposalCartPriceRuleCalculator->calculatePriceRule( $cart, $item->getCartPriceRule(), - $voucherCode + $voucherCode, ); } else { $this->cartPriceRuleUnProcessor->unProcess($cart, $item->getCartPriceRule(), $voucherCode); diff --git a/src/CoreShop/Component/Core/Order/Processor/CartRuleAutoProcessor.php b/src/CoreShop/Component/Core/Order/Processor/CartRuleAutoProcessor.php index 73577a5981..2843cc1ace 100644 --- a/src/CoreShop/Component/Core/Order/Processor/CartRuleAutoProcessor.php +++ b/src/CoreShop/Component/Core/Order/Processor/CartRuleAutoProcessor.php @@ -1,17 +1,20 @@ carrierPriceCalculator->getPrice( $cart->getCarrier(), $cart, $address, false, - $context + $context, ); $cart->addAdjustment( @@ -108,8 +117,8 @@ public function process(OrderInterface $cart): void AdjustmentInterface::SHIPPING, '', $priceWithTax, - $priceWithoutTax - ) + $priceWithoutTax, + ), ); } diff --git a/src/CoreShop/Component/Core/Order/Processor/CartTaxProcessor.php b/src/CoreShop/Component/Core/Order/Processor/CartTaxProcessor.php index b2105f7fcc..2b5cbb2a79 100644 --- a/src/CoreShop/Component/Core/Order/Processor/CartTaxProcessor.php +++ b/src/CoreShop/Component/Core/Order/Processor/CartTaxProcessor.php @@ -1,17 +1,20 @@ taxCollector->mergeTaxes( $item->getTaxes() instanceof Fieldcollection ? $item->getTaxes()->getItems() : [], - $usedTaxes + $usedTaxes, ); } diff --git a/src/CoreShop/Component/Core/Order/Processor/CartTextProcessor.php b/src/CoreShop/Component/Core/Order/Processor/CartTextProcessor.php index 5e114252fb..f10b2ef592 100644 --- a/src/CoreShop/Component/Core/Order/Processor/CartTextProcessor.php +++ b/src/CoreShop/Component/Core/Order/Processor/CartTextProcessor.php @@ -1,17 +1,20 @@ setWeight($orderItem->getItemWeight() * $quantity); diff --git a/src/CoreShop/Component/Core/Order/Transformer/OrderToShipmentTransformer.php b/src/CoreShop/Component/Core/Order/Transformer/OrderToShipmentTransformer.php index 0342acfb8b..f075c2c86a 100644 --- a/src/CoreShop/Component/Core/Order/Transformer/OrderToShipmentTransformer.php +++ b/src/CoreShop/Component/Core/Order/Transformer/OrderToShipmentTransformer.php @@ -1,17 +1,20 @@ setWeight($order->getWeight()); diff --git a/src/CoreShop/Component/Core/Payment/Resolver/StoreBasedPaymentProviderResolver.php b/src/CoreShop/Component/Core/Payment/Resolver/StoreBasedPaymentProviderResolver.php index c8e1d5c82d..cdc81d96ef 100644 --- a/src/CoreShop/Component/Core/Payment/Resolver/StoreBasedPaymentProviderResolver.php +++ b/src/CoreShop/Component/Core/Payment/Resolver/StoreBasedPaymentProviderResolver.php @@ -1,17 +1,20 @@ getId() === null) { throw new \Exception( sprintf( 'cannot clone quantity price rules on a unsaved product (reference product id: %d.)', - $referenceProduct->getId() - ) + $referenceProduct->getId(), + ), ); } @@ -43,6 +49,7 @@ public function clone( /** * @var Concrete&ProductInterface $referenceProduct + * * @psalm-var Concrete&ProductInterface $referenceProduct */ $qprFieldDefinition = $referenceProduct->getClass()->getFieldDefinition('quantityPriceRules'); @@ -60,7 +67,7 @@ public function clone( protected function reallocateRanges( ProductInterface $product, array $newQuantityPriceRules, - array $oldQuantityPriceRules + array $oldQuantityPriceRules, ) { if (count($oldQuantityPriceRules) !== count($newQuantityPriceRules)) { throw new \Exception('Count of old an new rules does not match'); @@ -88,7 +95,7 @@ protected function reallocateRanges( ) { $allocatedUnitDefinition = $this->unitMatcher->findMatchingUnitDefinitionByUnitName( $product, - $referenceRange->getUnitDefinition()->getUnitName() + $referenceRange->getUnitDefinition()->getUnitName(), ); if (!$allocatedUnitDefinition instanceof ProductUnitDefinitionInterface) { diff --git a/src/CoreShop/Component/Core/Product/Cloner/ProductUnitDefinitionsCloner.php b/src/CoreShop/Component/Core/Product/Cloner/ProductUnitDefinitionsCloner.php index 06b250b9f2..494f9dda86 100644 --- a/src/CoreShop/Component/Core/Product/Cloner/ProductUnitDefinitionsCloner.php +++ b/src/CoreShop/Component/Core/Product/Cloner/ProductUnitDefinitionsCloner.php @@ -1,13 +1,19 @@ hasUnitDefinitions() === true && $resetExistingData === false) { return; @@ -34,6 +40,7 @@ public function clone( /** * @var Concrete&ProductInterface $referenceProduct + * * @psalm-var Concrete&ProductInterface $referenceProduct */ $unitDefinitionsFieldDefinition = $referenceProduct->getClass()->getFieldDefinition('unitDefinitions'); @@ -50,12 +57,12 @@ public function clone( $unitDefinitions = $unitDefinitionsFieldDefinition->createDataCopy( $referenceProduct, - $referenceProduct->getUnitDefinitions() + $referenceProduct->getUnitDefinitions(), ); $storeValues = $storeValuesFieldDefinition->createDataCopy( $referenceProduct, - $referenceProduct->getStoreValues() + $referenceProduct->getStoreValues(), ); $product->setUnitDefinitions($unitDefinitions); diff --git a/src/CoreShop/Component/Core/Product/Cloner/UnitMatcher.php b/src/CoreShop/Component/Core/Product/Cloner/UnitMatcher.php index a191fa51fc..68a4705057 100644 --- a/src/CoreShop/Component/Core/Product/Cloner/UnitMatcher.php +++ b/src/CoreShop/Component/Core/Product/Cloner/UnitMatcher.php @@ -1,13 +1,19 @@ getUnitDefinitions()->getUnitDefinitions() as $unitDefinition) { - if (!$unitDefinition instanceof ProductUnitDefinitionInterface) { continue; } diff --git a/src/CoreShop/Component/Core/Product/Cloner/UnitMatcherInterface.php b/src/CoreShop/Component/Core/Product/Cloner/UnitMatcherInterface.php index 1720ae3d47..4e3470ae21 100644 --- a/src/CoreShop/Component/Core/Product/Cloner/UnitMatcherInterface.php +++ b/src/CoreShop/Component/Core/Product/Cloner/UnitMatcherInterface.php @@ -1,13 +1,19 @@ getTaxRule(); diff --git a/src/CoreShop/Component/Core/Product/ProductTaxCalculatorFactoryInterface.php b/src/CoreShop/Component/Core/Product/ProductTaxCalculatorFactoryInterface.php index 30f5e3c2b2..b1df02eea3 100644 --- a/src/CoreShop/Component/Core/Product/ProductTaxCalculatorFactoryInterface.php +++ b/src/CoreShop/Component/Core/Product/ProductTaxCalculatorFactoryInterface.php @@ -1,17 +1,20 @@ getCategoriesToCheck( $configuration['categories'], $params['store'], - $configuration['recursive'] ?: false + $configuration['recursive'] ?: false, ); if (!is_array($subject->getCategories())) { diff --git a/src/CoreShop/Component/Core/Product/Rule/Condition/CountriesConditionChecker.php b/src/CoreShop/Component/Core/Product/Rule/Condition/CountriesConditionChecker.php index 8b154d49e1..1f757e1870 100644 --- a/src/CoreShop/Component/Core/Product/Rule/Condition/CountriesConditionChecker.php +++ b/src/CoreShop/Component/Core/Product/Rule/Condition/CountriesConditionChecker.php @@ -1,17 +1,20 @@ getProductsToCheck( $configuration['products'], $params['store'], - $configuration['include_variants'] ?: false + $configuration['include_variants'] ?: false, ); return in_array($subject->getId(), $productIdsToCheck); diff --git a/src/CoreShop/Component/Core/Product/Rule/Condition/QuantityConditionChecker.php b/src/CoreShop/Component/Core/Product/Rule/Condition/QuantityConditionChecker.php index 5c9c0fc3bf..1c27a87e61 100644 --- a/src/CoreShop/Component/Core/Product/Rule/Condition/QuantityConditionChecker.php +++ b/src/CoreShop/Component/Core/Product/Rule/Condition/QuantityConditionChecker.php @@ -1,17 +1,20 @@ inner->calculateForQuantity( @@ -45,7 +50,7 @@ public function calculateForQuantity( $subject, $quantity, $originalPrice, - $context + $context, ); } @@ -62,7 +67,7 @@ public function calculateForQuantity( } if ($subject instanceof ProductInterface && is_numeric($subject->getItemQuantityFactor()) && $subject->getItemQuantityFactor() > 1) { - $price = (int)($price / $subject->getItemQuantityFactor()); + $price = (int) ($price / $subject->getItemQuantityFactor()); } return $price; @@ -72,7 +77,7 @@ public function calculateForRange( QuantityRangeInterface $range, QuantityRangePriceAwareInterface $subject, int $originalPrice, - array $context + array $context, ): int { return $this->inner->calculateForRange($range, $subject, $originalPrice, $context); } @@ -80,7 +85,7 @@ public function calculateForRange( protected function locate( Collection $ranges, float $quantity, - ProductUnitDefinitionInterface $unitDefinition + ProductUnitDefinitionInterface $unitDefinition, ): ?QuantityRangeInterface { if ($ranges->isEmpty()) { return null; @@ -98,7 +103,7 @@ static function (CoreQuantityRangeInterface $range) use ($unitDefinition) { } return true; - } + }, ); // reset array index diff --git a/src/CoreShop/Component/Core/ProductQuantityPriceRules/Rule/Action/AmountDecreaseAction.php b/src/CoreShop/Component/Core/ProductQuantityPriceRules/Rule/Action/AmountDecreaseAction.php index 77c942b868..afbe5ccbcd 100644 --- a/src/CoreShop/Component/Core/ProductQuantityPriceRules/Rule/Action/AmountDecreaseAction.php +++ b/src/CoreShop/Component/Core/ProductQuantityPriceRules/Rule/Action/AmountDecreaseAction.php @@ -1,17 +1,20 @@ getCategoriesToCheck( $configuration['categories'], $shippable->getStore(), - $configuration['recursive'] ?: false + $configuration['recursive'] ?: false, ); foreach ($cartItems as $item) { diff --git a/src/CoreShop/Component/Core/Shipping/Rule/Condition/CountriesConditionChecker.php b/src/CoreShop/Component/Core/Shipping/Rule/Condition/CountriesConditionChecker.php index bca85dff7f..2467544341 100644 --- a/src/CoreShop/Component/Core/Shipping/Rule/Condition/CountriesConditionChecker.php +++ b/src/CoreShop/Component/Core/Shipping/Rule/Condition/CountriesConditionChecker.php @@ -1,17 +1,20 @@ getCountry(); diff --git a/src/CoreShop/Component/Core/Shipping/Rule/Condition/CurrenciesConditionChecker.php b/src/CoreShop/Component/Core/Shipping/Rule/Condition/CurrenciesConditionChecker.php index b17994e847..0382189727 100644 --- a/src/CoreShop/Component/Core/Shipping/Rule/Condition/CurrenciesConditionChecker.php +++ b/src/CoreShop/Component/Core/Shipping/Rule/Condition/CurrenciesConditionChecker.php @@ -1,17 +1,20 @@ getProductsToCheck( $configuration['products'], $shippable->getStore(), - $configuration['include_variants'] ?: false + $configuration['include_variants'] ?: false, ); $cartItems = $shippable->getItems(); diff --git a/src/CoreShop/Component/Core/Shipping/Rule/Condition/StoresConditionChecker.php b/src/CoreShop/Component/Core/Shipping/Rule/Condition/StoresConditionChecker.php index cff7481fca..706dd403aa 100644 --- a/src/CoreShop/Component/Core/Shipping/Rule/Condition/StoresConditionChecker.php +++ b/src/CoreShop/Component/Core/Shipping/Rule/Condition/StoresConditionChecker.php @@ -1,17 +1,20 @@ getCountry(); diff --git a/src/CoreShop/Component/Core/Shipping/Taxation/TaxCalculationStrategyCartItems.php b/src/CoreShop/Component/Core/Shipping/Taxation/TaxCalculationStrategyCartItems.php index f2411baaf7..2489a0cc64 100644 --- a/src/CoreShop/Component/Core/Shipping/Taxation/TaxCalculationStrategyCartItems.php +++ b/src/CoreShop/Component/Core/Shipping/Taxation/TaxCalculationStrategyCartItems.php @@ -1,17 +1,20 @@ taxCalculationFactory->getTaxCalculatorForAddress( $taxRuleGroup[$i], $address, - $context + $context, ); if ($useGrossValues) { diff --git a/src/CoreShop/Component/Core/Shipping/Taxation/TaxCalculationStrategyTaxRule.php b/src/CoreShop/Component/Core/Shipping/Taxation/TaxCalculationStrategyTaxRule.php index baf9cdec03..d7f0ec45fb 100644 --- a/src/CoreShop/Component/Core/Shipping/Taxation/TaxCalculationStrategyTaxRule.php +++ b/src/CoreShop/Component/Core/Shipping/Taxation/TaxCalculationStrategyTaxRule.php @@ -1,17 +1,20 @@ getId(), ($address->getCountry() instanceof CountryInterface ? $address->getCountry()->getId() : 0), - ($address->getState() instanceof StateInterface ? $address->getState()->getId() : 0) + ($address->getState() instanceof StateInterface ? $address->getState()->getId() : 0), ); foreach ($context as $key => $value) { if ($value instanceof ResourceInterface) { - $cacheIdentifier .= '-'.$key.'-'.$value->getId(); + $cacheIdentifier .= '-' . $key . '-' . $value->getId(); } } @@ -51,7 +54,7 @@ public function getTaxCalculatorForAddress( $this->cache[$cacheIdentifier] = $this->taxCalculatorFactory->getTaxCalculatorForAddress( $taxRuleGroup, $address, - $context + $context, ); } diff --git a/src/CoreShop/Component/Core/Taxation/DefaultTaxationDisplayProvider.php b/src/CoreShop/Component/Core/Taxation/DefaultTaxationDisplayProvider.php index 5bd57c67f6..c0ce7f2154 100644 --- a/src/CoreShop/Component/Core/Taxation/DefaultTaxationDisplayProvider.php +++ b/src/CoreShop/Component/Core/Taxation/DefaultTaxationDisplayProvider.php @@ -1,17 +1,20 @@ taxRuleRepository->findForCountryAndState( $taxRuleGroup, $address->getCountry(), - $address->getState() + $address->getState(), ); $taxRates = []; $firstRow = true; diff --git a/src/CoreShop/Component/Core/Taxation/TaxCalculatorFactoryInterface.php b/src/CoreShop/Component/Core/Taxation/TaxCalculatorFactoryInterface.php index 8500fb2b32..b204cc2c83 100644 --- a/src/CoreShop/Component/Core/Taxation/TaxCalculatorFactoryInterface.php +++ b/src/CoreShop/Component/Core/Taxation/TaxCalculatorFactoryInterface.php @@ -1,17 +1,20 @@ $this->parseAmount($object->getAdjustmentsTotal(AdjustmentInterface::CART_PRICE_RULE)), 'currency' => $object->getCurrency()->getIsoCode(), 'items' => $items, - ] + ], ); } protected function parseAmount(int $amount): int { - return (int)round((round($amount / $this->decimalFactor, $this->decimalPrecision)), 0); + return (int) round((round($amount / $this->decimalFactor, $this->decimalPrecision)), 0); } } diff --git a/src/CoreShop/Component/Core/Tracking/Extractor/OrderItemExtractor.php b/src/CoreShop/Component/Core/Tracking/Extractor/OrderItemExtractor.php index 7bda3f6bf3..cec79bb85b 100644 --- a/src/CoreShop/Component/Core/Tracking/Extractor/OrderItemExtractor.php +++ b/src/CoreShop/Component/Core/Tracking/Extractor/OrderItemExtractor.php @@ -1,17 +1,20 @@ $object instanceof ProductInterface ? $object->getSku() : '', 'price' => $this->taxedPurchasablePriceCalculator->getPrice( $object, - $this->shopperContext->getContext() + $this->shopperContext->getContext(), ) / $this->decimalFactor, 'currency' => $this->shopperContext->getCurrency()->getIsoCode(), 'categories' => array_map(static function (CategoryInterface $category) { diff --git a/src/CoreShop/Component/Core/Translation/TranslatableEntityPimcoreLocaleAssigner.php b/src/CoreShop/Component/Core/Translation/TranslatableEntityPimcoreLocaleAssigner.php index a2b1e97722..fb471487e2 100644 --- a/src/CoreShop/Component/Core/Translation/TranslatableEntityPimcoreLocaleAssigner.php +++ b/src/CoreShop/Component/Core/Translation/TranslatableEntityPimcoreLocaleAssigner.php @@ -1,17 +1,20 @@ */ private PriorityQueue $currencyContexts; diff --git a/src/CoreShop/Component/Currency/Context/CurrencyContextInterface.php b/src/CoreShop/Component/Currency/Context/CurrencyContextInterface.php index fcf3ffb0dc..57ecf7dda4 100644 --- a/src/CoreShop/Component/Currency/Context/CurrencyContextInterface.php +++ b/src/CoreShop/Component/Currency/Context/CurrencyContextInterface.php @@ -1,17 +1,20 @@ getFromCurrency()->getIsoCode() === $fromCurrencyCode) { - return (int)round($value * $exchangeRate->getExchangeRate()); + return (int) round($value * $exchangeRate->getExchangeRate()); } - return (int)round($value / $exchangeRate->getExchangeRate()); + return (int) round($value / $exchangeRate->getExchangeRate()); } private function getExchangeRate(string $fromCode, string $toCode): ?ExchangeRateInterface diff --git a/src/CoreShop/Component/Currency/Converter/CurrencyConverterInterface.php b/src/CoreShop/Component/Currency/Converter/CurrencyConverterInterface.php index 1423ae1858..cb76c60400 100644 --- a/src/CoreShop/Component/Currency/Converter/CurrencyConverterInterface.php +++ b/src/CoreShop/Component/Currency/Converter/CurrencyConverterInterface.php @@ -1,17 +1,20 @@ */ private PriorityQueue $customerContexts; diff --git a/src/CoreShop/Component/Customer/Context/CustomerContextInterface.php b/src/CoreShop/Component/Customer/Context/CustomerContextInterface.php index 745250f5f6..51690ce2dd 100644 --- a/src/CoreShop/Component/Customer/Context/CustomerContextInterface.php +++ b/src/CoreShop/Component/Customer/Context/CustomerContextInterface.php @@ -1,17 +1,20 @@ */ private PriorityQueue $requestResolvers; diff --git a/src/CoreShop/Component/Customer/Context/RequestBased/CustomerContext.php b/src/CoreShop/Component/Customer/Context/RequestBased/CustomerContext.php index 01910e16c9..b74ebb4432 100644 --- a/src/CoreShop/Component/Customer/Context/RequestBased/CustomerContext.php +++ b/src/CoreShop/Component/Customer/Context/RequestBased/CustomerContext.php @@ -1,17 +1,20 @@ conditions = $conditions; } diff --git a/src/CoreShop/Component/Index/Condition/ConditionInterface.php b/src/CoreShop/Component/Index/Condition/ConditionInterface.php index 68ec3d41c9..e65dc14392 100644 --- a/src/CoreShop/Component/Index/Condition/ConditionInterface.php +++ b/src/CoreShop/Component/Index/Condition/ConditionInterface.php @@ -1,17 +1,20 @@ ', $value); } } diff --git a/src/CoreShop/Component/Index/Condition/GreaterThanEqualCondition.php b/src/CoreShop/Component/Index/Condition/GreaterThanEqualCondition.php index 8438be1888..8d94e10f8f 100644 --- a/src/CoreShop/Component/Index/Condition/GreaterThanEqualCondition.php +++ b/src/CoreShop/Component/Index/Condition/GreaterThanEqualCondition.php @@ -1,23 +1,28 @@ =', $value); } } diff --git a/src/CoreShop/Component/Index/Condition/InCondition.php b/src/CoreShop/Component/Index/Condition/InCondition.php index 85a31266ab..cafc34a234 100644 --- a/src/CoreShop/Component/Index/Condition/InCondition.php +++ b/src/CoreShop/Component/Index/Condition/InCondition.php @@ -1,17 +1,20 @@ fieldName = $fieldName; $this->values = $values; } diff --git a/src/CoreShop/Component/Index/Condition/IsCondition.php b/src/CoreShop/Component/Index/Condition/IsCondition.php index ccd5f64419..da500bbf08 100644 --- a/src/CoreShop/Component/Index/Condition/IsCondition.php +++ b/src/CoreShop/Component/Index/Condition/IsCondition.php @@ -1,23 +1,28 @@ allowedPatterns, true)) { throw new \InvalidArgumentException(sprintf('Pattern %s not allowed, allowed are %s', $pattern, implode(', ', $this->allowedPatterns))); } diff --git a/src/CoreShop/Component/Index/Condition/LowerThanCondition.php b/src/CoreShop/Component/Index/Condition/LowerThanCondition.php index 70d9443837..e6be9122ae 100644 --- a/src/CoreShop/Component/Index/Condition/LowerThanCondition.php +++ b/src/CoreShop/Component/Index/Condition/LowerThanCondition.php @@ -1,23 +1,28 @@ ', $value); } } diff --git a/src/CoreShop/Component/Index/Condition/RangeCondition.php b/src/CoreShop/Component/Index/Condition/RangeCondition.php index c7560f72bd..7a55bfd81a 100644 --- a/src/CoreShop/Component/Index/Condition/RangeCondition.php +++ b/src/CoreShop/Component/Index/Condition/RangeCondition.php @@ -1,23 +1,29 @@ getConfiguration()['field']; @@ -49,7 +52,7 @@ public function addCondition( ListingInterface $list, array $currentFilter, ParameterBag $parameterBag, - bool $isPrecondition = false + bool $isPrecondition = false, ): array { $field = $condition->getConfiguration()['field']; $value = $parameterBag->get($field); @@ -59,16 +62,16 @@ public function addCondition( } if (!empty($value)) { - $value = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); + $value = filter_var($value, \FILTER_VALIDATE_BOOLEAN, \FILTER_NULL_ON_FAILURE); $currentFilter[$field] = $value; $fieldName = $field; if ($isPrecondition) { - $fieldName = 'PRECONDITION_'.$fieldName; + $fieldName = 'PRECONDITION_' . $fieldName; } - $list->addCondition(new MatchCondition($field, (string)$value), $fieldName); + $list->addCondition(new MatchCondition($field, (string) $value), $fieldName); } return $currentFilter; diff --git a/src/CoreShop/Component/Index/Filter/CategoryMultiSelectConditionProcessor.php b/src/CoreShop/Component/Index/Filter/CategoryMultiSelectConditionProcessor.php index e40e3830d4..124924d6a0 100644 --- a/src/CoreShop/Component/Index/Filter/CategoryMultiSelectConditionProcessor.php +++ b/src/CoreShop/Component/Index/Filter/CategoryMultiSelectConditionProcessor.php @@ -1,17 +1,20 @@ $e, 'count' => $count]; @@ -57,7 +60,7 @@ public function prepareValuesForRendering(FilterConditionInterface $condition, F $objects = []; foreach ($values as $value) { - $object = Concrete::getById((int)$value['value']); + $object = Concrete::getById((int) $value['value']); if ($object instanceof Concrete) { $objects[] = $object; } @@ -106,7 +109,7 @@ public function addCondition(FilterConditionInterface $condition, FilterInterfac } unset($v); - + $concatenator = $condition->getConfiguration()['concatenator'] ?: 'OR'; $list->addCondition(new ConcatCondition($field, $concatenator, $likeConditions), $fieldName); diff --git a/src/CoreShop/Component/Index/Filter/CategorySelectConditionProcessor.php b/src/CoreShop/Component/Index/Filter/CategorySelectConditionProcessor.php index f5a0516e71..06716ce019 100644 --- a/src/CoreShop/Component/Index/Filter/CategorySelectConditionProcessor.php +++ b/src/CoreShop/Component/Index/Filter/CategorySelectConditionProcessor.php @@ -1,17 +1,20 @@ $e, 'count' => $count]; @@ -55,7 +58,7 @@ public function prepareValuesForRendering(FilterConditionInterface $condition, F $objects = []; foreach ($values as $value) { - $object = Concrete::getById((int)$value['value']); + $object = Concrete::getById((int) $value['value']); if ($object instanceof Concrete) { $objects[] = $object; } @@ -94,7 +97,7 @@ public function addCondition(FilterConditionInterface $condition, FilterInterfac } if (!empty($value)) { - $value = '%,' . trim((string)$value) . ',%'; + $value = '%,' . trim((string) $value) . ',%'; $fieldName = $isPrecondition ? 'PRECONDITION_' . $field : $field; $list->addCondition(new LikeCondition($field, 'both', $value), $fieldName); } diff --git a/src/CoreShop/Component/Index/Filter/FilterConditionProcessorInterface.php b/src/CoreShop/Component/Index/Filter/FilterConditionProcessorInterface.php index f858a2e26c..4a62001fe8 100644 --- a/src/CoreShop/Component/Index/Filter/FilterConditionProcessorInterface.php +++ b/src/CoreShop/Component/Index/Filter/FilterConditionProcessorInterface.php @@ -1,17 +1,20 @@ 0 ? $rawValues[count($rawValues) - 1]['value'] : 0; $currentValueMin = $minValue; - if (isset($currentFilter["$field-min"]) && ('' !== (string)$currentFilter["$field-min"])) { + if (isset($currentFilter["$field-min"]) && ('' !== (string) $currentFilter["$field-min"])) { $currentValueMin = $currentFilter["$field-min"]; } $currentValueMax = $maxValue; - if (isset($currentFilter["$field-max"]) && ('' !== (string)$currentFilter["$field-max"])) { + if (isset($currentFilter["$field-max"]) && ('' !== (string) $currentFilter["$field-max"])) { $currentValueMax = $currentFilter["$field-max"]; } @@ -95,7 +98,7 @@ public function addCondition(FilterConditionInterface $condition, FilterInterfac $fieldName = 'PRECONDITION_' . $fieldName; } - $list->addCondition(new RangeCondition($field, (float)$valueMin, (float)$valueMax), $fieldName); + $list->addCondition(new RangeCondition($field, (float) $valueMin, (float) $valueMax), $fieldName); } return $currentFilter; diff --git a/src/CoreShop/Component/Index/Filter/RelationalMultiselectConditionProcessor.php b/src/CoreShop/Component/Index/Filter/RelationalMultiselectConditionProcessor.php index 95b6230187..5cc7ddcbb5 100644 --- a/src/CoreShop/Component/Index/Filter/RelationalMultiselectConditionProcessor.php +++ b/src/CoreShop/Component/Index/Filter/RelationalMultiselectConditionProcessor.php @@ -1,17 +1,20 @@ addRelationCondition(new MatchCondition('dest', (string)$value), $fieldName); + $list->addRelationCondition(new MatchCondition('dest', (string) $value), $fieldName); } return $currentFilter; diff --git a/src/CoreShop/Component/Index/Filter/SearchConditionProcessor.php b/src/CoreShop/Component/Index/Filter/SearchConditionProcessor.php index 163176f698..206ab0ae90 100644 --- a/src/CoreShop/Component/Index/Filter/SearchConditionProcessor.php +++ b/src/CoreShop/Component/Index/Filter/SearchConditionProcessor.php @@ -1,17 +1,20 @@ getConfiguration()['pattern']; diff --git a/src/CoreShop/Component/Index/Filter/SelectFilterConditionFromMultiselectProcessor.php b/src/CoreShop/Component/Index/Filter/SelectFilterConditionFromMultiselectProcessor.php index 236dd15ead..f674782fd5 100644 --- a/src/CoreShop/Component/Index/Filter/SelectFilterConditionFromMultiselectProcessor.php +++ b/src/CoreShop/Component/Index/Filter/SelectFilterConditionFromMultiselectProcessor.php @@ -1,17 +1,20 @@ addCondition(new MatchCondition($field, (string)$value), $fieldName); + $list->addCondition(new MatchCondition($field, (string) $value), $fieldName); } return $currentFilter; diff --git a/src/CoreShop/Component/Index/Getter/BrickGetter.php b/src/CoreShop/Component/Index/Getter/BrickGetter.php index 0715e63781..cf7aa2a438 100644 --- a/src/CoreShop/Component/Index/Getter/BrickGetter.php +++ b/src/CoreShop/Component/Index/Getter/BrickGetter.php @@ -1,17 +1,20 @@ getObjectKey()); - return LocaleFallbackHelper::useFallbackValues(function() use ($brick, $getter) { + return LocaleFallbackHelper::useFallbackValues(function () use ($brick, $getter) { $values = []; foreach ($this->localeProvider->getDefinedLocalesCodes() as $locale) { $values[$locale] = $brick->$getter($locale); diff --git a/src/CoreShop/Component/Index/Getter/ClassificationStoreGetter.php b/src/CoreShop/Component/Index/Getter/ClassificationStoreGetter.php index 099ef85419..6ede8acfb1 100644 --- a/src/CoreShop/Component/Index/Getter/ClassificationStoreGetter.php +++ b/src/CoreShop/Component/Index/Getter/ClassificationStoreGetter.php @@ -1,17 +1,20 @@ localeProvider->getDefinedLocalesCodes() as $locale) { $fieldValues[$locale][] = $item->$fieldGetter($locale); } }); + continue; } diff --git a/src/CoreShop/Component/Index/Getter/GetterInterface.php b/src/CoreShop/Component/Index/Getter/GetterInterface.php index 17a64cf97f..1d21dc484a 100644 --- a/src/CoreShop/Component/Index/Getter/GetterInterface.php +++ b/src/CoreShop/Component/Index/Getter/GetterInterface.php @@ -1,17 +1,20 @@ getObjectKey()); - return LocaleFallbackHelper::useFallbackValues(function() use($object, $getter) { + return LocaleFallbackHelper::useFallbackValues(function () use ($object, $getter) { $values = []; foreach ($this->localeProvider->getDefinedLocalesCodes() as $locale) { diff --git a/src/CoreShop/Component/Index/Interpreter/ExpressionInterpreter.php b/src/CoreShop/Component/Index/Interpreter/ExpressionInterpreter.php index 9a2f26afe5..0db23363bc 100644 --- a/src/CoreShop/Component/Index/Interpreter/ExpressionInterpreter.php +++ b/src/CoreShop/Component/Index/Interpreter/ExpressionInterpreter.php @@ -1,17 +1,20 @@ assert($interpreterConfig); diff --git a/src/CoreShop/Component/Index/Interpreter/NestedInterpreter.php b/src/CoreShop/Component/Index/Interpreter/NestedInterpreter.php index 23c5a1fd69..3ca953309a 100644 --- a/src/CoreShop/Component/Index/Interpreter/NestedInterpreter.php +++ b/src/CoreShop/Component/Index/Interpreter/NestedInterpreter.php @@ -1,17 +1,20 @@ assert($interpreterConfig); diff --git a/src/CoreShop/Component/Index/Interpreter/NestedTrait.php b/src/CoreShop/Component/Index/Interpreter/NestedTrait.php index 2c67a094d3..c26af4cc01 100644 --- a/src/CoreShop/Component/Index/Interpreter/NestedTrait.php +++ b/src/CoreShop/Component/Index/Interpreter/NestedTrait.php @@ -1,17 +1,20 @@ getId(); diff --git a/src/CoreShop/Component/Index/Interpreter/ObjectIdSumInterpreter.php b/src/CoreShop/Component/Index/Interpreter/ObjectIdSumInterpreter.php index 55d2435279..16f2f451fe 100644 --- a/src/CoreShop/Component/Index/Interpreter/ObjectIdSumInterpreter.php +++ b/src/CoreShop/Component/Index/Interpreter/ObjectIdSumInterpreter.php @@ -1,17 +1,20 @@ getValue(); diff --git a/src/CoreShop/Component/Index/Interpreter/RelationInterpreterInterface.php b/src/CoreShop/Component/Index/Interpreter/RelationInterpreterInterface.php index 253c90d356..453fa2167a 100644 --- a/src/CoreShop/Component/Index/Interpreter/RelationInterpreterInterface.php +++ b/src/CoreShop/Component/Index/Interpreter/RelationInterpreterInterface.php @@ -1,17 +1,20 @@ assert($interpreterConfig); @@ -48,7 +51,7 @@ public function interpret( mixed $value, IndexableInterface $indexable, IndexColumnInterface $config, - array $interpreterConfig = [] + array $interpreterConfig = [], ): mixed { $this->assert($interpreterConfig); diff --git a/src/CoreShop/Component/Index/Interpreter/RelationalValue.php b/src/CoreShop/Component/Index/Interpreter/RelationalValue.php index edbcaa7b9c..7a5fa78584 100644 --- a/src/CoreShop/Component/Index/Interpreter/RelationalValue.php +++ b/src/CoreShop/Component/Index/Interpreter/RelationalValue.php @@ -1,25 +1,31 @@ params = $params; } diff --git a/src/CoreShop/Component/Index/Interpreter/RelationalValueInterface.php b/src/CoreShop/Component/Index/Interpreter/RelationalValueInterface.php index 20d960cedd..d0aef55f5c 100644 --- a/src/CoreShop/Component/Index/Interpreter/RelationalValueInterface.php +++ b/src/CoreShop/Component/Index/Interpreter/RelationalValueInterface.php @@ -1,17 +1,20 @@ getGroupByRelationValues($field); foreach ($values as &$id) { - $id = (int)$id; + $id = (int) $id; $obj = Concrete::getById($id); if ($obj) { diff --git a/src/CoreShop/Component/Index/Worker/FilterGroupHelperInterface.php b/src/CoreShop/Component/Index/Worker/FilterGroupHelperInterface.php index dd2a3d6d14..8af5c8c97e 100644 --- a/src/CoreShop/Component/Index/Worker/FilterGroupHelperInterface.php +++ b/src/CoreShop/Component/Index/Worker/FilterGroupHelperInterface.php @@ -1,17 +1,20 @@ */ private PriorityQueue $localeContexts; diff --git a/src/CoreShop/Component/Locale/Context/FixedLocaleContext.php b/src/CoreShop/Component/Locale/Context/FixedLocaleContext.php index 0329ab0b53..d3164edcd2 100644 --- a/src/CoreShop/Component/Locale/Context/FixedLocaleContext.php +++ b/src/CoreShop/Component/Locale/Context/FixedLocaleContext.php @@ -1,17 +1,20 @@ pimcoreLocaleService->findLocale(); diff --git a/src/CoreShop/Component/Locale/Model/LocaleAwareInterface.php b/src/CoreShop/Component/Locale/Model/LocaleAwareInterface.php index 24df2d0281..efec7db73c 100644 --- a/src/CoreShop/Component/Locale/Model/LocaleAwareInterface.php +++ b/src/CoreShop/Component/Locale/Model/LocaleAwareInterface.php @@ -1,17 +1,20 @@ eventDispatcher->dispatch( new GenericEvent($storageList, ['item' => $item]), - CartEvents::PRE_REMOVE_ITEM + CartEvents::PRE_REMOVE_ITEM, ); $storageList->removeItem($item); @@ -54,7 +60,7 @@ public function removeFromList(StorageListInterface $storageList, StorageListIte $this->eventDispatcher->dispatch( new GenericEvent($storageList, ['item' => $item]), - CartEvents::POST_REMOVE_ITEM + CartEvents::POST_REMOVE_ITEM, ); } @@ -64,7 +70,7 @@ private function resolveItem(StorageListInterface $storageList, StorageListItemI if ($this->cartItemResolver->equals($item, $storageListItem)) { $this->cartItemQuantityModifier->modify( $item, - $item->getQuantity() + $storageListItem->getQuantity() + $item->getQuantity() + $storageListItem->getQuantity(), ); return; @@ -73,14 +79,14 @@ private function resolveItem(StorageListInterface $storageList, StorageListItemI $this->eventDispatcher->dispatch( new GenericEvent($storageList, ['item' => $storageListItem]), - CartEvents::PRE_ADD_ITEM + CartEvents::PRE_ADD_ITEM, ); $storageList->addItem($storageListItem); $this->eventDispatcher->dispatch( new GenericEvent($storageList, ['item' => $storageListItem]), - CartEvents::POST_ADD_ITEM + CartEvents::POST_ADD_ITEM, ); } } diff --git a/src/CoreShop/Component/Order/Cart/CartModifierInterface.php b/src/CoreShop/Component/Order/Cart/CartModifierInterface.php index 2c1a506360..6cd760f62f 100644 --- a/src/CoreShop/Component/Order/Cart/CartModifierInterface.php +++ b/src/CoreShop/Component/Order/Cart/CartModifierInterface.php @@ -1,17 +1,20 @@ getItems() as $item) { $voucher = $cartPriceRuleItem->getVoucherCode() ? $this->voucherRepository->findByCode($cartPriceRuleItem->getVoucherCode()) : null; $priceRuleItem = $item->getPriceRuleByCartPriceRule($cartPriceRuleItem->getCartPriceRule(), $voucher); $params = [ 'voucher' => $voucher, - 'cartPriceRule' => $cartPriceRuleItem->getCartPriceRule() + 'cartPriceRule' => $cartPriceRuleItem->getCartPriceRule(), ]; $existingPriceRule = null !== $priceRuleItem; @@ -70,6 +72,7 @@ public function applyRule(OrderInterface $cart, array $configuration, PriceRuleI if (!$this->isValid($item, $cartPriceRuleItem, $configuration['conditions'], $params)) { $item->removePriceRule($priceRuleItem); + continue; } @@ -112,8 +115,8 @@ public function applyRule(OrderInterface $cart, array $configuration, PriceRuleI AdjustmentInterface::CART_PRICE_RULE, $cartPriceRuleItem->getCartPriceRule()->getName(), $cartPriceRuleItem->getDiscount(true), - $cartPriceRuleItem->getDiscount(false) - ) + $cartPriceRuleItem->getDiscount(false), + ), ); return $overallResult; @@ -145,7 +148,7 @@ public function unApplyRule(OrderInterface $cart, array $configuration, PriceRul $item->removePriceRule($priceRuleItem); } - + return true; } diff --git a/src/CoreShop/Component/Order/Cart/Rule/Action/CartPriceRuleActionProcessorInterface.php b/src/CoreShop/Component/Order/Cart/Rule/Action/CartPriceRuleActionProcessorInterface.php index 0a7105df2a..46d08b23c4 100644 --- a/src/CoreShop/Component/Order/Cart/Rule/Action/CartPriceRuleActionProcessorInterface.php +++ b/src/CoreShop/Component/Order/Cart/Rule/Action/CartPriceRuleActionProcessorInterface.php @@ -1,17 +1,20 @@ getConditions(), - $params + $params, ); } } diff --git a/src/CoreShop/Component/Order/Cart/Rule/CartPriceRuleValidationProcessorInterface.php b/src/CoreShop/Component/Order/Cart/Rule/CartPriceRuleValidationProcessorInterface.php index 37003816fe..20145c9a2b 100644 --- a/src/CoreShop/Component/Order/Cart/Rule/CartPriceRuleValidationProcessorInterface.php +++ b/src/CoreShop/Component/Order/Cart/Rule/CartPriceRuleValidationProcessorInterface.php @@ -1,17 +1,20 @@ getAmount(), - $instruction->getLength() + $instruction->getLength(), ); parent::__construct($message, $exceptionCode, $previousException); diff --git a/src/CoreShop/Component/Order/Exception/NoPurchasableDiscountPriceFoundException.php b/src/CoreShop/Component/Order/Exception/NoPurchasableDiscountPriceFoundException.php index 79508d76e5..25211ff006 100644 --- a/src/CoreShop/Component/Order/Exception/NoPurchasableDiscountPriceFoundException.php +++ b/src/CoreShop/Component/Order/Exception/NoPurchasableDiscountPriceFoundException.php @@ -1,23 +1,28 @@ voucherCodeRepository->countCodes( $length, $generator->getPrefix(), - $generator->getSuffix() + $generator->getSuffix(), ); $letters = $this->letterResolver->findLetters($generator); @@ -60,6 +66,6 @@ private function calculatePossibleGenerationAmount(CartPriceRuleVoucherGenerator return \PHP_INT_MAX - $generatedAmount; } - return (int)$codeCombination - $generatedAmount; + return (int) $codeCombination - $generatedAmount; } } diff --git a/src/CoreShop/Component/Order/Generator/CodeGeneratorCheckerInterface.php b/src/CoreShop/Component/Order/Generator/CodeGeneratorCheckerInterface.php index 93e436325c..97cd736d86 100644 --- a/src/CoreShop/Component/Order/Generator/CodeGeneratorCheckerInterface.php +++ b/src/CoreShop/Component/Order/Generator/CodeGeneratorCheckerInterface.php @@ -1,17 +1,20 @@ getPimcoreNeutral(); + return (bool) $this->getPimcoreNeutral(); } public function setNeutral(bool $neutral) diff --git a/src/CoreShop/Component/Order/Model/AdjustmentInterface.php b/src/CoreShop/Component/Order/Model/AdjustmentInterface.php index ec87850d21..df2824373d 100644 --- a/src/CoreShop/Component/Order/Model/AdjustmentInterface.php +++ b/src/CoreShop/Component/Order/Model/AdjustmentInterface.php @@ -1,17 +1,20 @@ getIsGiftItem()) { @@ -118,7 +119,7 @@ public function getConvertedItemRetailPrice(bool $withTax = true): int public function setConvertedItemRetailPrice(int $itemRetailPrice, bool $withTax = true) { $withTax ? $this->setConvertedItemRetailPriceGross($itemRetailPrice) : $this->setConvertedItemRetailPriceNet( - $itemRetailPrice + $itemRetailPrice, ); } diff --git a/src/CoreShop/Component/Order/Model/OrderItemInterface.php b/src/CoreShop/Component/Order/Model/OrderItemInterface.php index 5e4bfced8f..d34097481b 100644 --- a/src/CoreShop/Component/Order/Model/OrderItemInterface.php +++ b/src/CoreShop/Component/Order/Model/OrderItemInterface.php @@ -1,15 +1,4 @@ sequenceNumberGenerator->getNextSequenceForType($this->type); + return (string) $this->sequenceNumberGenerator->getNextSequenceForType($this->type); } } diff --git a/src/CoreShop/Component/Order/OrderInvoiceStates.php b/src/CoreShop/Component/Order/OrderInvoiceStates.php index 1803382ec0..5009cdd286 100644 --- a/src/CoreShop/Component/Order/OrderInvoiceStates.php +++ b/src/CoreShop/Component/Order/OrderInvoiceStates.php @@ -1,17 +1,20 @@ getOrderNumber()) + str_replace(' ', '_', $order->getOrderNumber()), ) . '_' . $uniqueId; /** @@ -59,7 +66,7 @@ public function provideOrderPayment(OrderInterface $order): PaymentInterface [ '%items%' => count($order->getItems()), '%total%' => round($order->getTotal() / $this->decimalFactor, $this->decimalPrecision), - ] + ], ); $payment->setDescription($description); diff --git a/src/CoreShop/Component/Order/Payment/OrderPaymentProviderInterface.php b/src/CoreShop/Component/Order/Payment/OrderPaymentProviderInterface.php index 39cf77be61..2957078e27 100644 --- a/src/CoreShop/Component/Order/Payment/OrderPaymentProviderInterface.php +++ b/src/CoreShop/Component/Order/Payment/OrderPaymentProviderInterface.php @@ -1,17 +1,20 @@ $orderItem->getOrder(), 'order_item' => $orderItem, 'options' => $options, - ] + ], ); $itemFolder = $this->folderCreationService->createFolderForResource($documentItem, ['prefix' => $orderDocument->getFullPath()]); @@ -75,7 +80,7 @@ public function transform( 'order' => $orderItem->getOrder(), 'order_item' => $orderItem, 'options' => $options, - ] + ], ); return $documentItem; diff --git a/src/CoreShop/Component/Order/Transformer/OrderItemToShipmentItemTransformer.php b/src/CoreShop/Component/Order/Transformer/OrderItemToShipmentItemTransformer.php index 1776dee63a..72a9aa0f33 100644 --- a/src/CoreShop/Component/Order/Transformer/OrderItemToShipmentItemTransformer.php +++ b/src/CoreShop/Component/Order/Transformer/OrderItemToShipmentItemTransformer.php @@ -1,17 +1,20 @@ $orderItem->getOrder(), 'order_item' => $orderItem, 'options' => $options, - ] + ], ); $itemFolder = $this->folderCreationService->createFolderForResource($documentItem, ['prefix' => $orderDocument->getFullPath()]); @@ -74,7 +79,7 @@ public function transform( 'order' => $orderItem->getOrder(), 'order_item' => $orderItem, 'options' => $options, - ] + ], ); return $documentItem; diff --git a/src/CoreShop/Component/Order/Transformer/OrderToInvoiceTransformer.php b/src/CoreShop/Component/Order/Transformer/OrderToInvoiceTransformer.php index d425bc23b4..9a102add32 100644 --- a/src/CoreShop/Component/Order/Transformer/OrderToInvoiceTransformer.php +++ b/src/CoreShop/Component/Order/Transformer/OrderToInvoiceTransformer.php @@ -1,17 +1,20 @@ eventDispatcher->dispatch( $event, - sprintf('%s.%s.pre_%s', 'coreshop', $modelName, 'transform') + sprintf('%s.%s.pre_%s', 'coreshop', $modelName, 'transform'), ); } @@ -40,7 +43,7 @@ public function dispatchPostEvent(string $modelName, ResourceInterface $model, a $this->eventDispatcher->dispatch( $event, - sprintf('%s.%s.post_%s', 'coreshop', $modelName, 'transform') + sprintf('%s.%s.post_%s', 'coreshop', $modelName, 'transform'), ); } diff --git a/src/CoreShop/Component/Order/Transformer/TransformerEventDispatcherInterface.php b/src/CoreShop/Component/Order/Transformer/TransformerEventDispatcherInterface.php index 4cc391bd46..f92408d0ae 100644 --- a/src/CoreShop/Component/Order/Transformer/TransformerEventDispatcherInterface.php +++ b/src/CoreShop/Component/Order/Transformer/TransformerEventDispatcherInterface.php @@ -1,17 +1,20 @@ list->setLimit($batchSize); } diff --git a/src/CoreShop/Component/Pimcore/BatchProcessing/DataObjectBatchListing.php b/src/CoreShop/Component/Pimcore/BatchProcessing/DataObjectBatchListing.php index 379eac73f6..2bb2ea6a00 100644 --- a/src/CoreShop/Component/Pimcore/BatchProcessing/DataObjectBatchListing.php +++ b/src/CoreShop/Component/Pimcore/BatchProcessing/DataObjectBatchListing.php @@ -1,17 +1,20 @@ list::class + $this->list::class, )); } @@ -103,8 +108,8 @@ private function load(): void throw new \InvalidArgumentException( sprintf( '%s listing class does not support loadIdList.', - $this->list::class - ) + $this->list::class, + ), ); } diff --git a/src/CoreShop/Component/Pimcore/DataObject/AbstractDefinitionUpdate.php b/src/CoreShop/Component/Pimcore/DataObject/AbstractDefinitionUpdate.php index ad6fa1c7c1..f09b0c0a8e 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/AbstractDefinitionUpdate.php +++ b/src/CoreShop/Component/Pimcore/DataObject/AbstractDefinitionUpdate.php @@ -1,17 +1,20 @@ childrenPath][$index]); - } + }, ); } @@ -88,7 +93,7 @@ function (array &$foundField, int $index, array &$parent) use ($jsonFieldDefinit array_splice($childs, $index, 0, [$jsonFieldDefinition]); $parent[$this->childrenPath] = $childs; - } + }, ); } @@ -103,7 +108,7 @@ function (array &$foundField, int $index, array &$parent) use ($jsonFieldDefinit array_splice($childs, $index + 1, 0, [$jsonFieldDefinition]); $parent[$this->childrenPath] = $childs; - } + }, ); } @@ -116,7 +121,7 @@ function (array &$foundField, int $index, array &$parent) use ($keyValues) { foreach ($keyValues as $key => $value) { $foundField[$key] = $value; } - } + }, ); } @@ -127,7 +132,7 @@ public function replaceField(string $fieldName, array $jsonFieldDefinition): voi false, function (array &$foundField, int $index, array &$parent) use ($jsonFieldDefinition) { $foundField = $jsonFieldDefinition; - } + }, ); } @@ -146,7 +151,7 @@ function (array &$foundField, int $index, array &$parent) use ($jsonFieldDefinit array_splice($childs, $index, 0, [$jsonFieldDefinition]); $parent[$this->childrenPath] = $childs; - } + }, ); } @@ -161,7 +166,7 @@ function (array &$foundField, int $index, array &$parent) use ($jsonFieldDefinit array_splice($childs, $index + 1, 0, [$jsonFieldDefinition]); $parent[$this->childrenPath] = $childs; - } + }, ); } @@ -172,7 +177,7 @@ public function replaceLayout(string $fieldName, array $jsonFieldDefinition): vo true, function (array &$foundField, int $index, array &$parent) use ($jsonFieldDefinition) { $foundField = $jsonFieldDefinition; - } + }, ); } @@ -185,7 +190,7 @@ function (array &$foundField, int $index, array &$parent) use ($keyValues) { foreach ($keyValues as $key => $value) { $foundField[$key] = $value; } - } + }, ); } @@ -196,7 +201,7 @@ public function removeLayout(string $fieldName): void true, function (array &$foundField, int $index, array &$parent) { unset($parent[$this->childrenPath][$index]); - } + }, ); } diff --git a/src/CoreShop/Component/Pimcore/DataObject/AbstractSluggableLinkGenerator.php b/src/CoreShop/Component/Pimcore/DataObject/AbstractSluggableLinkGenerator.php index c70273b470..c619a29b6f 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/AbstractSluggableLinkGenerator.php +++ b/src/CoreShop/Component/Pimcore/DataObject/AbstractSluggableLinkGenerator.php @@ -1,17 +1,20 @@ fieldDefinitions = $this->classDefinition->getFieldDefinitions(); $this->jsonDefinition = json_decode( DataObject\ClassDefinition\Service::generateClassDefinitionJson($this->classDefinition), - true + true, ); } public function save(): bool { return null !== DataObject\ClassDefinition\Service::importClassDefinitionFromJson( - $this->classDefinition, - json_encode($this->jsonDefinition), - true - ); + $this->classDefinition, + json_encode($this->jsonDefinition), + true, + ); } } diff --git a/src/CoreShop/Component/Pimcore/DataObject/ClassUpdateInterface.php b/src/CoreShop/Component/Pimcore/DataObject/ClassUpdateInterface.php index 7c30ba7a8f..a23fe4a470 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ClassUpdateInterface.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ClassUpdateInterface.php @@ -1,17 +1,20 @@ eventDispatcher->dispatch( new GenericEvent($note, $eventParams), - sprintf('coreshop.note.%s.post_add', $note->getType()) + sprintf('coreshop.note.%s.post_add', $note->getType()), ); return $note; @@ -109,7 +112,7 @@ public function deleteNote(int $noteId, array $eventParams = []): void $this->eventDispatcher->dispatch( new GenericEvent($note, $eventParams), - sprintf('coreshop.note.%s.pot_delete', $noteType) + sprintf('coreshop.note.%s.pot_delete', $noteType), ); } } diff --git a/src/CoreShop/Component/Pimcore/DataObject/NoteServiceInterface.php b/src/CoreShop/Component/Pimcore/DataObject/NoteServiceInterface.php index b643a89d0c..e1f8ade771 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/NoteServiceInterface.php +++ b/src/CoreShop/Component/Pimcore/DataObject/NoteServiceInterface.php @@ -1,17 +1,20 @@ getFullPath(), - SluggableInterface::class + SluggableInterface::class, )); } diff --git a/src/CoreShop/Component/Pimcore/Slug/SluggableSlugger.php b/src/CoreShop/Component/Pimcore/Slug/SluggableSlugger.php index 6ef6268fc0..467d2a0a9e 100644 --- a/src/CoreShop/Component/Pimcore/Slug/SluggableSlugger.php +++ b/src/CoreShop/Component/Pimcore/Slug/SluggableSlugger.php @@ -1,17 +1,20 @@ getNameForSlug($locale) ?: (string)$sluggable->getId(); + $name = $sluggable->getNameForSlug($locale) ?: (string) $sluggable->getId(); if (!$name) { throw new SlugNotPossibleException('name is empty'); @@ -36,14 +39,14 @@ public function slug(SluggableInterface $sluggable, string $locale, string $suff '/%s/%s-%s', $locale, strtolower($this->slugger->slug($name, '-', $locale)->toString()), - $suffix + $suffix, ); } return sprintf( '/%s/%s', $locale, - strtolower($this->slugger->slug($name, '-', $locale)->toString()) + strtolower($this->slugger->slug($name, '-', $locale)->toString()), ); } } diff --git a/src/CoreShop/Component/Pimcore/Slug/SluggableSluggerInterface.php b/src/CoreShop/Component/Pimcore/Slug/SluggableSluggerInterface.php index 96eab49175..00b18da6f0 100644 --- a/src/CoreShop/Component/Pimcore/Slug/SluggableSluggerInterface.php +++ b/src/CoreShop/Component/Pimcore/Slug/SluggableSluggerInterface.php @@ -1,17 +1,20 @@ inner->getPrice($product, $context, $withDiscount); } - $identifier = sprintf('%s%s', $product->getId(), (string)$withDiscount); + $identifier = sprintf('%s%s', $product->getId(), (string) $withDiscount); if (!isset($this->cachedPrice[$identifier])) { $this->cachedPrice[$identifier] = $this->inner->getPrice($product, $context, $withDiscount); diff --git a/src/CoreShop/Component/Product/Calculator/ProductDiscountCalculatorInterface.php b/src/CoreShop/Component/Product/Calculator/ProductDiscountCalculatorInterface.php index 982332fec4..c7dd3ac8fc 100644 --- a/src/CoreShop/Component/Product/Calculator/ProductDiscountCalculatorInterface.php +++ b/src/CoreShop/Component/Product/Calculator/ProductDiscountCalculatorInterface.php @@ -1,17 +1,20 @@ getUnit()->getId() !== $defaultDefinition->getUnit()->getId(); - }); + }) + ; return new ArrayCollection(array_values($additionalDefinitions->toArray())); } diff --git a/src/CoreShop/Component/Product/Model/ProductUnitDefinitionsInterface.php b/src/CoreShop/Component/Product/Model/ProductUnitDefinitionsInterface.php index a87a8957bf..420680d1a6 100644 --- a/src/CoreShop/Component/Product/Model/ProductUnitDefinitionsInterface.php +++ b/src/CoreShop/Component/Product/Model/ProductUnitDefinitionsInterface.php @@ -1,17 +1,20 @@ locate($quantityPriceRule->getRanges(), $quantity); @@ -48,7 +51,7 @@ public function calculateForRange( QuantityRangeInterface $range, QuantityRangePriceAwareInterface $subject, int $originalPrice, - array $context + array $context, ): int { return $this->calculateRangePrice($range, $subject, $originalPrice, $context); } diff --git a/src/CoreShop/Component/ProductQuantityPriceRules/Detector/QuantityReferenceDetector.php b/src/CoreShop/Component/ProductQuantityPriceRules/Detector/QuantityReferenceDetector.php index e6786a6e3e..c8445fd7a4 100644 --- a/src/CoreShop/Component/ProductQuantityPriceRules/Detector/QuantityReferenceDetector.php +++ b/src/CoreShop/Component/ProductQuantityPriceRules/Detector/QuantityReferenceDetector.php @@ -1,17 +1,20 @@ getPercentage() / 100) * $realItemPrice)), 0); + return max($realItemPrice - ((int) round(($range->getPercentage() / 100) * $realItemPrice)), 0); } } diff --git a/src/CoreShop/Component/ProductQuantityPriceRules/Rule/Action/PercentageIncreaseAction.php b/src/CoreShop/Component/ProductQuantityPriceRules/Rule/Action/PercentageIncreaseAction.php index 161a0465a0..4adc337593 100644 --- a/src/CoreShop/Component/ProductQuantityPriceRules/Rule/Action/PercentageIncreaseAction.php +++ b/src/CoreShop/Component/ProductQuantityPriceRules/Rule/Action/PercentageIncreaseAction.php @@ -1,17 +1,20 @@ getPercentage() / 100) * $realItemPrice)); + return $realItemPrice + ((int) round(($range->getPercentage() / 100) * $realItemPrice)); } } diff --git a/src/CoreShop/Component/ProductQuantityPriceRules/Rule/Action/ProductQuantityPriceRuleActionInterface.php b/src/CoreShop/Component/ProductQuantityPriceRules/Rule/Action/ProductQuantityPriceRuleActionInterface.php index a5b044a8bd..562fadbdc2 100644 --- a/src/CoreShop/Component/ProductQuantityPriceRules/Rule/Action/ProductQuantityPriceRuleActionInterface.php +++ b/src/CoreShop/Component/ProductQuantityPriceRules/Rule/Action/ProductQuantityPriceRuleActionInterface.php @@ -1,17 +1,20 @@ priortyMap = new PriorityMap(); } @@ -36,7 +41,7 @@ public function register(string $identifier, int $priority, object $service): vo if (!in_array($this->interface, class_implements($service), true)) { throw new \InvalidArgumentException( - sprintf('%s needs to implement "%s", "%s" given.', ucfirst($this->context), $this->interface, $service::class) + sprintf('%s needs to implement "%s", "%s" given.', ucfirst($this->context), $this->interface, $service::class), ); } diff --git a/src/CoreShop/Component/Registry/PrioritizedServiceRegistryInterface.php b/src/CoreShop/Component/Registry/PrioritizedServiceRegistryInterface.php index 353bfd9cd5..b5832507a4 100644 --- a/src/CoreShop/Component/Registry/PrioritizedServiceRegistryInterface.php +++ b/src/CoreShop/Component/Registry/PrioritizedServiceRegistryInterface.php @@ -1,17 +1,20 @@ addMethodCall('add', [$tag['type'], 'default', $tag['form-type']]); + ->addMethodCall('add', [$tag['type'], 'default', $tag['form-type']]) + ; } } } diff --git a/src/CoreShop/Component/Registry/RegisterSimpleRegistryTypePass.php b/src/CoreShop/Component/Registry/RegisterSimpleRegistryTypePass.php index 7e73038775..3358d8d2bc 100644 --- a/src/CoreShop/Component/Registry/RegisterSimpleRegistryTypePass.php +++ b/src/CoreShop/Component/Registry/RegisterSimpleRegistryTypePass.php @@ -1,17 +1,20 @@ interface, class_implements($service), true)) { throw new \InvalidArgumentException( - sprintf('%s needs to implement "%s", "%s" given.', ucfirst($this->context), $this->interface, $service::class) + sprintf('%s needs to implement "%s", "%s" given.', ucfirst($this->context), $this->interface, $service::class), ); } diff --git a/src/CoreShop/Component/Registry/ServiceRegistryInterface.php b/src/CoreShop/Component/Registry/ServiceRegistryInterface.php index 5e09d458cc..1c0e6b0e53 100644 --- a/src/CoreShop/Component/Registry/ServiceRegistryInterface.php +++ b/src/CoreShop/Component/Registry/ServiceRegistryInterface.php @@ -1,17 +1,20 @@ doctrineProvider = $doctrineProvider; @@ -44,7 +50,7 @@ public function getGraphQlFieldConfig($attribute, Data $fieldDefinition, $class 'type' => $this->getFieldType($fieldDefinition, $class, $container), 'resolve' => $this->getResolver($attribute, $fieldDefinition, $class), ], - $container + $container, ); } diff --git a/src/CoreShop/Component/Resource/DataHub/QueryType/ResourceList.php b/src/CoreShop/Component/Resource/DataHub/QueryType/ResourceList.php index a38b603a84..8779cbfc51 100644 --- a/src/CoreShop/Component/Resource/DataHub/QueryType/ResourceList.php +++ b/src/CoreShop/Component/Resource/DataHub/QueryType/ResourceList.php @@ -1,17 +1,20 @@ repositoryClassName( $objectManager, - $objectManager->getMetadataFactory()->getMetadataFor($this->className) + $objectManager->getMetadataFactory()->getMetadataFor($this->className), ); } } diff --git a/src/CoreShop/Component/Resource/Factory/RepositoryFactoryInterface.php b/src/CoreShop/Component/Resource/Factory/RepositoryFactoryInterface.php index 840ba733ee..6764ae975d 100644 --- a/src/CoreShop/Component/Resource/Factory/RepositoryFactoryInterface.php +++ b/src/CoreShop/Component/Resource/Factory/RepositoryFactoryInterface.php @@ -1,17 +1,20 @@ driver = $parameters['driver']; $this->templatesNamespace = array_key_exists('templates', $parameters) ? $parameters['templates'] : null; diff --git a/src/CoreShop/Component/Resource/Metadata/MetadataInterface.php b/src/CoreShop/Component/Resource/Metadata/MetadataInterface.php index 7574b1b9e6..8f39f20698 100644 --- a/src/CoreShop/Component/Resource/Metadata/MetadataInterface.php +++ b/src/CoreShop/Component/Resource/Metadata/MetadataInterface.php @@ -1,17 +1,20 @@ objectService->createFolderByPath( - sprintf('%s%s%s', $options['prefix'], $path, $options['suffix']) + sprintf('%s%s%s', $options['prefix'], $path, $options['suffix']), ); } } diff --git a/src/CoreShop/Component/Resource/Service/FolderCreationServiceInterface.php b/src/CoreShop/Component/Resource/Service/FolderCreationServiceInterface.php index 6f096cbfef..7c74f05913 100644 --- a/src/CoreShop/Component/Resource/Service/FolderCreationServiceInterface.php +++ b/src/CoreShop/Component/Resource/Service/FolderCreationServiceInterface.php @@ -1,17 +1,20 @@ processed[$subject->getId()])) { $this->processed[$subject->getId()] = [ diff --git a/src/CoreShop/Component/Rule/Condition/TraceableRuleConditionsValidationProcessorInterface.php b/src/CoreShop/Component/Rule/Condition/TraceableRuleConditionsValidationProcessorInterface.php index 88673d8d87..d3012f38ad 100644 --- a/src/CoreShop/Component/Rule/Condition/TraceableRuleConditionsValidationProcessorInterface.php +++ b/src/CoreShop/Component/Rule/Condition/TraceableRuleConditionsValidationProcessorInterface.php @@ -1,17 +1,20 @@ shippingRuleProcessor->getModification( $shippingRule, @@ -49,7 +54,7 @@ public function getPrice(CarrierInterface $carrier, ShippableInterface $shippabl $shippable, $address, $price, - $context + $context, ); return $price + $modifications; diff --git a/src/CoreShop/Component/Shipping/Calculator/CompositePriceCalculator.php b/src/CoreShop/Component/Shipping/Calculator/CompositePriceCalculator.php index 14d5d51bab..43143acde2 100644 --- a/src/CoreShop/Component/Shipping/Calculator/CompositePriceCalculator.php +++ b/src/CoreShop/Component/Shipping/Calculator/CompositePriceCalculator.php @@ -1,17 +1,20 @@ getShippingRules(); diff --git a/src/CoreShop/Component/Shipping/Checker/CarrierShippingRuleCheckerInterface.php b/src/CoreShop/Component/Shipping/Checker/CarrierShippingRuleCheckerInterface.php index ff71724ff9..b6f8d47799 100644 --- a/src/CoreShop/Component/Shipping/Checker/CarrierShippingRuleCheckerInterface.php +++ b/src/CoreShop/Component/Shipping/Checker/CarrierShippingRuleCheckerInterface.php @@ -1,17 +1,20 @@ hideFromCheckout = $hideFromCheckout; } - + public function getLogo() { return $this->logo; diff --git a/src/CoreShop/Component/Shipping/Model/CarrierAwareInterface.php b/src/CoreShop/Component/Shipping/Model/CarrierAwareInterface.php index 4f06c741d9..53bd182b37 100644 --- a/src/CoreShop/Component/Shipping/Model/CarrierAwareInterface.php +++ b/src/CoreShop/Component/Shipping/Model/CarrierAwareInterface.php @@ -1,17 +1,20 @@ getConfiguration(), - $context + $context, ); } } @@ -61,7 +64,7 @@ public function getModification( ShippableInterface $shippable, AddressInterface $address, int $price, - array $context + array $context, ): int { $modifications = 0; @@ -75,7 +78,7 @@ public function getModification( $address, $price, $action->getConfiguration(), - $context + $context, ); } } diff --git a/src/CoreShop/Component/Shipping/Resolver/CarriersResolver.php b/src/CoreShop/Component/Shipping/Resolver/CarriersResolver.php index e5d201f838..007c54e439 100644 --- a/src/CoreShop/Component/Shipping/Resolver/CarriersResolver.php +++ b/src/CoreShop/Component/Shipping/Resolver/CarriersResolver.php @@ -1,17 +1,20 @@ shippingRuleRepository->find($configuration['shippingRule']); @@ -49,7 +54,7 @@ public function getModification( AddressInterface $address, int $price, array $configuration, - array $context + array $context, ): int { $shippingRule = $this->shippingRuleRepository->find($configuration['shippingRule']); diff --git a/src/CoreShop/Component/Shipping/Rule/Condition/AbstractConditionChecker.php b/src/CoreShop/Component/Shipping/Rule/Condition/AbstractConditionChecker.php index e2cc9a18ee..a2698b8a8a 100644 --- a/src/CoreShop/Component/Shipping/Rule/Condition/AbstractConditionChecker.php +++ b/src/CoreShop/Component/Shipping/Rule/Condition/AbstractConditionChecker.php @@ -1,17 +1,20 @@ */ protected PriorityQueue $contexts; diff --git a/src/CoreShop/Component/StorageList/Context/StorageListContextInterface.php b/src/CoreShop/Component/StorageList/Context/StorageListContextInterface.php index 1df4f4840d..3f59ee3da4 100644 --- a/src/CoreShop/Component/StorageList/Context/StorageListContextInterface.php +++ b/src/CoreShop/Component/StorageList/Context/StorageListContextInterface.php @@ -1,17 +1,20 @@ addToWishlistClass($storageList, $storageListItem); if (!in_array(AddToStorageListInterface::class, class_implements($class), true)) { throw new \InvalidArgumentException( - sprintf('%s needs to implement "%s".', $class::class, AddToStorageListInterface::class) + sprintf('%s needs to implement "%s".', $class::class, AddToStorageListInterface::class), ); } diff --git a/src/CoreShop/Component/StorageList/Factory/AddToStorageListFactoryInterface.php b/src/CoreShop/Component/StorageList/Factory/AddToStorageListFactoryInterface.php index ae885b7f33..f035d9e30d 100644 --- a/src/CoreShop/Component/StorageList/Factory/AddToStorageListFactoryInterface.php +++ b/src/CoreShop/Component/StorageList/Factory/AddToStorageListFactoryInterface.php @@ -1,17 +1,20 @@ setParent( $this->folderCreationService->createFolderForResource( $item, - ['prefix' => $storageList->getFullPath()] - ) + ['prefix' => $storageList->getFullPath()], + ), ); $item->setPublished(true); $item->setKey($index + 1); diff --git a/src/CoreShop/Component/StorageList/Model/StorageList.php b/src/CoreShop/Component/StorageList/Model/StorageList.php index ed646a34da..f85b1645f6 100644 --- a/src/CoreShop/Component/StorageList/Model/StorageList.php +++ b/src/CoreShop/Component/StorageList/Model/StorageList.php @@ -1,17 +1,20 @@ storageListItemFinder->equals($item, $storageListItem)) { $this->storageListItemQuantityModifier->modify( $item, - $item->getQuantity() + $storageListItem->getQuantity() + $item->getQuantity() + $storageListItem->getQuantity(), ); return; diff --git a/src/CoreShop/Component/StorageList/StorageListItemModelEqualsResolver.php b/src/CoreShop/Component/StorageList/StorageListItemModelEqualsResolver.php index 86203f14bc..6fb0959fc5 100644 --- a/src/CoreShop/Component/StorageList/StorageListItemModelEqualsResolver.php +++ b/src/CoreShop/Component/StorageList/StorageListItemModelEqualsResolver.php @@ -1,17 +1,20 @@ */ private PriorityQueue $storeContexts; diff --git a/src/CoreShop/Component/Store/Context/FixedStoreContext.php b/src/CoreShop/Component/Store/Context/FixedStoreContext.php index ceb6c36ffb..42ccf81ff4 100644 --- a/src/CoreShop/Component/Store/Context/FixedStoreContext.php +++ b/src/CoreShop/Component/Store/Context/FixedStoreContext.php @@ -1,17 +1,20 @@ request->get('id'); if ($id) { - $document = Document::getById((int)$id); + $document = Document::getById((int) $id); } } diff --git a/src/CoreShop/Component/Store/Context/RequestBased/PimcoreAreaBrickRenderResolver.php b/src/CoreShop/Component/Store/Context/RequestBased/PimcoreAreaBrickRenderResolver.php index 5a8111dbff..23d0530f1d 100644 --- a/src/CoreShop/Component/Store/Context/RequestBased/PimcoreAreaBrickRenderResolver.php +++ b/src/CoreShop/Component/Store/Context/RequestBased/PimcoreAreaBrickRenderResolver.php @@ -1,17 +1,20 @@ request->get('documentId'); if ($documentId) { - $document = Document::getById((int)$documentId); + $document = Document::getById((int) $documentId); if ($document) { $site = Frontend::getSiteForDocument($document); diff --git a/src/CoreShop/Component/Store/Context/RequestBased/RequestResolverInterface.php b/src/CoreShop/Component/Store/Context/RequestBased/RequestResolverInterface.php index f65ff93417..90fa1f5588 100644 --- a/src/CoreShop/Component/Store/Context/RequestBased/RequestResolverInterface.php +++ b/src/CoreShop/Component/Store/Context/RequestBased/RequestResolverInterface.php @@ -1,17 +1,20 @@ taxRates = $taxRates; - $this->computationMethod = (int)$computationMethod; + $this->computationMethod = (int) $computationMethod; } public function applyTaxes(int $price): int { - return (int)round($price * (1 + ($this->getTotalRate() / 100))); + return (int) round($price * (1 + ($this->getTotalRate() / 100))); } public function removeTaxes(int $price): int { - return (int)round($price / (1 + $this->getTotalRate() / 100)); + return (int) round($price / (1 + $this->getTotalRate() / 100)); } public function getTotalRate(): float @@ -58,7 +63,7 @@ public function getTotalRate(): float } } - return (float)$taxes; + return (float) $taxes; } public function getTaxesAmountFromGross(int $price): int @@ -72,10 +77,10 @@ public function getTaxesAmountFromGrossAsArray(int $price): array foreach ($this->getTaxRates() as $tax) { if ($this->computationMethod === self::ONE_AFTER_ANOTHER_METHOD) { - $taxesAmounts[$tax->getId()] = (int)round($price - ($price / (1 + ($tax->getRate() / 100)))); + $taxesAmounts[$tax->getId()] = (int) round($price - ($price / (1 + ($tax->getRate() / 100)))); $price -= $taxesAmounts[$tax->getId()]; } else { - $taxesAmounts[$tax->getId()] = (int)round($price - ($price / (1 + ($tax->getRate() / 100)))); + $taxesAmounts[$tax->getId()] = (int) round($price - ($price / (1 + ($tax->getRate() / 100)))); } } @@ -84,7 +89,7 @@ public function getTaxesAmountFromGrossAsArray(int $price): array public function getTaxesAmount(int $price): int { - return (int)array_sum($this->getTaxesAmountAsArray($price)); + return (int) array_sum($this->getTaxesAmountAsArray($price)); } public function getTaxesAmountAsArray(int $price): array @@ -93,10 +98,10 @@ public function getTaxesAmountAsArray(int $price): array foreach ($this->getTaxRates() as $tax) { if ($this->computationMethod === self::ONE_AFTER_ANOTHER_METHOD) { - $taxesAmounts[$tax->getId()] = (int)round($price * (abs($tax->getRate()) / 100)); + $taxesAmounts[$tax->getId()] = (int) round($price * (abs($tax->getRate()) / 100)); $price += $taxesAmounts[$tax->getId()]; } else { - $taxesAmounts[$tax->getId()] = (int)round(($price * (abs($tax->getRate()) / 100))); + $taxesAmounts[$tax->getId()] = (int) round(($price * (abs($tax->getRate()) / 100))); } } diff --git a/src/CoreShop/Component/Taxation/Collector/TaxCollector.php b/src/CoreShop/Component/Taxation/Collector/TaxCollector.php index eeafdafcd0..f9cd348118 100644 --- a/src/CoreShop/Component/Taxation/Collector/TaxCollector.php +++ b/src/CoreShop/Component/Taxation/Collector/TaxCollector.php @@ -1,17 +1,20 @@ $a->getGroup()->getSorting() <=> $b->getGroup()->getSorting()); + usort($resolvedGroups, static fn (ResolvedAttributeGroup $a, ResolvedAttributeGroup $b) => $a->getGroup()->getSorting() <=> $b->getGroup()->getSorting()); return $resolvedGroups; } diff --git a/src/CoreShop/Component/Variant/AttributeCollectorInterface.php b/src/CoreShop/Component/Variant/AttributeCollectorInterface.php index 688b39fb4e..569cab672d 100644 --- a/src/CoreShop/Component/Variant/AttributeCollectorInterface.php +++ b/src/CoreShop/Component/Variant/AttributeCollectorInterface.php @@ -1,17 +1,20 @@ setObjectTypes([AbstractObject::OBJECT_TYPE_VARIANT]); $variants = $list->getObjects(); - } - else { + } else { $variants = $this->getChildren([AbstractObject::OBJECT_TYPE_VARIANT]); } @@ -79,24 +81,26 @@ public function findMainVariant(): ?ProductVariantAwareInterface $attributesA = $a->getAttributes(); $attributesB = $b->getAttributes(); - usort($attributesA, - static fn( + usort( + $attributesA, + static fn ( AttributeInterface $attributeA, - AttributeInterface $attributeB - ) => $attributeA->getAttributeGroup()->getSorting() <=> $attributeB->getAttributeGroup()->getSorting() + AttributeInterface $attributeB, + ) => $attributeA->getAttributeGroup()->getSorting() <=> $attributeB->getAttributeGroup()->getSorting(), ); - usort($attributesB, - static fn( + usort( + $attributesB, + static fn ( AttributeInterface $attributeA, - AttributeInterface $attributeB - ) => $attributeA->getAttributeGroup()->getSorting() <=> $attributeB->getAttributeGroup()->getSorting() + AttributeInterface $attributeB, + ) => $attributeA->getAttributeGroup()->getSorting() <=> $attributeB->getAttributeGroup()->getSorting(), ); return - array_map(static fn(AttributeInterface $aa): ?float => $aa->getSorting(), $attributesA) + array_map(static fn (AttributeInterface $aa): ?float => $aa->getSorting(), $attributesA) <=> - array_map(static fn(AttributeInterface $bb): ?float => $bb->getSorting(), $attributesB); + array_map(static fn (AttributeInterface $bb): ?float => $bb->getSorting(), $attributesB); }); if (count($variants) > 0) { diff --git a/src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttribute.php b/src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttribute.php index 18013e721b..6592a766c4 100644 --- a/src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttribute.php +++ b/src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttribute.php @@ -1,17 +1,20 @@ products->contains($product); } -} \ No newline at end of file +} diff --git a/src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttributeGroup.php b/src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttributeGroup.php index a9bd8fe481..cddfff50ad 100644 --- a/src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttributeGroup.php +++ b/src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttributeGroup.php @@ -1,17 +1,20 @@ attributes->toArray(); - usort($attributes, static fn(ResolvedAttribute $a, ResolvedAttribute $b) => $a->getAttribute()->getSorting() <=> $b->getAttribute()->getSorting()); + usort($attributes, static fn (ResolvedAttribute $a, ResolvedAttribute $b) => $a->getAttribute()->getSorting() <=> $b->getAttribute()->getSorting()); return $attributes; } diff --git a/src/CoreShop/Component/Variant/Model/Resolved/ResolvedIndex.php b/src/CoreShop/Component/Variant/Model/Resolved/ResolvedIndex.php index e97137aa0b..207912b575 100644 --- a/src/CoreShop/Component/Variant/Model/Resolved/ResolvedIndex.php +++ b/src/CoreShop/Component/Variant/Model/Resolved/ResolvedIndex.php @@ -1,17 +1,20 @@ url = $url; } -} \ No newline at end of file +} diff --git a/src/CoreShop/Component/Wishlist/Model/Wishlist.php b/src/CoreShop/Component/Wishlist/Model/Wishlist.php index 14cab6e849..e83b5db4a5 100644 --- a/src/CoreShop/Component/Wishlist/Model/Wishlist.php +++ b/src/CoreShop/Component/Wishlist/Model/Wishlist.php @@ -1,17 +1,20 @@ eventDispatcher->dispatch( new GenericEvent($storageList, ['item' => $item]), - WishlistEvents::PRE_REMOVE_ITEM + WishlistEvents::PRE_REMOVE_ITEM, ); $storageList->removeItem($item); @@ -57,7 +60,7 @@ public function removeFromList(StorageListInterface $storageList, StorageListIte $this->eventDispatcher->dispatch( new GenericEvent($storageList, ['item' => $item]), - WishlistEvents::POST_REMOVE_ITEM + WishlistEvents::POST_REMOVE_ITEM, ); } @@ -71,14 +74,14 @@ private function resolveItem(StorageListInterface $storageList, StorageListItemI $this->eventDispatcher->dispatch( new GenericEvent($storageList, ['item' => $storageListItem]), - WishlistEvents::PRE_ADD_ITEM + WishlistEvents::PRE_ADD_ITEM, ); $storageList->addItem($storageListItem); $this->eventDispatcher->dispatch( new GenericEvent($storageList, ['item' => $storageListItem]), - WishlistEvents::POST_ADD_ITEM + WishlistEvents::POST_ADD_ITEM, ); } } diff --git a/src/CoreShop/Component/Wishlist/WishlistEvents.php b/src/CoreShop/Component/Wishlist/WishlistEvents.php index 6ff7ce086f..91c56736e9 100644 --- a/src/CoreShop/Component/Wishlist/WishlistEvents.php +++ b/src/CoreShop/Component/Wishlist/WishlistEvents.php @@ -1,17 +1,20 @@ Date: Mon, 12 Sep 2022 16:52:34 +0200 Subject: [PATCH 2/3] [All] Refactor Code Styles --- .github/workflows/codestyles.yml | 48 +++++++++++++++++++ .../Behat/Context/Cli/InstallerContext.php | 1 + .../Behat/Context/Domain/CartContext.php | 1 + .../Context/Domain/CartPriceRuleContext.php | 1 + .../CartPriceRuleVoucherCodeContext.php | 1 + .../Behat/Context/Domain/CategoryContext.php | 1 + .../Behat/Context/Domain/CountryContext.php | 1 + .../Behat/Context/Domain/CurrencyContext.php | 1 + .../Behat/Context/Domain/CustomerContext.php | 1 + .../Context/Domain/CustomerGroupContext.php | 1 + .../Context/Domain/ExchangeRateContext.php | 1 + .../Behat/Context/Domain/FilterContext.php | 1 + .../Context/Domain/IndexConditionContext.php | 1 + .../Behat/Context/Domain/IndexContext.php | 1 + .../Context/Domain/LinkGeneratorContext.php | 1 + .../Behat/Context/Domain/MenuContext.php | 1 + .../Context/Domain/NotificationContext.php | 1 + .../Behat/Context/Domain/OrderContext.php | 1 + .../Context/Domain/PimcoreClassContext.php | 1 + .../Behat/Context/Domain/PimcoreContext.php | 1 + .../Behat/Context/Domain/ProductContext.php | 1 + .../Domain/ProductPriceRuleContext.php | 1 + .../ProductQuantityPriceRuleContext.php | 1 + .../ProductSpecificPriceRuleContext.php | 1 + .../Context/Domain/ProductUnitContext.php | 1 + .../Context/Domain/RecycleBinContext.php | 1 + .../Behat/Context/Domain/SEOContext.php | 1 + .../Behat/Context/Domain/ShippingContext.php | 1 + .../Behat/Context/Domain/StoreContext.php | 1 + .../Behat/Context/Domain/TaxRateContext.php | 1 + .../Context/Domain/TaxRuleGroupContext.php | 1 + .../Behat/Context/Domain/ThemeContext.php | 1 + .../Behat/Context/Domain/TrackingContext.php | 1 + .../Behat/Context/Domain/VariantContext.php | 1 + .../Context/Hook/CoreShopSetupContext.php | 1 + .../Behat/Context/Hook/DoctrineORMContext.php | 1 + .../Behat/Context/Hook/PimcoreDaoContext.php | 1 + .../Context/Hook/PimcoreSetupContext.php | 1 + .../Behat/Context/Setup/ActionFormTrait.php | 1 + .../Behat/Context/Setup/AddressContext.php | 1 + .../Context/Setup/BackendSecurityContext.php | 1 + .../Behat/Context/Setup/CartContext.php | 1 + .../Context/Setup/CartPriceRuleContext.php | 1 + .../Setup/CartPriceRuleVoucherCodeContext.php | 1 + .../Behat/Context/Setup/CategoryContext.php | 1 + .../Context/Setup/ConditionFormTrait.php | 1 + .../Context/Setup/ConfigurationContext.php | 1 + .../Behat/Context/Setup/CountryContext.php | 1 + .../Behat/Context/Setup/CurrencyContext.php | 1 + .../Behat/Context/Setup/CustomerContext.php | 1 + .../Context/Setup/CustomerGroupContext.php | 1 + .../Context/Setup/ExchangeRateContext.php | 1 + .../Behat/Context/Setup/FilterContext.php | 1 + .../Context/Setup/FrontendSecurityContext.php | 1 + .../Context/Setup/IndexConditionContext.php | 1 + .../Behat/Context/Setup/IndexContext.php | 1 + .../Behat/Context/Setup/LocaleContext.php | 1 + .../Behat/Context/Setup/LogContext.php | 1 + .../Context/Setup/ManufacturerContext.php | 1 + .../Setup/OptimisticEntityLockContext.php | 1 + .../Behat/Context/Setup/OrderContext.php | 1 + .../Context/Setup/OrderInvoiceContext.php | 1 + .../Context/Setup/OrderShipmentContext.php | 1 + .../Behat/Context/Setup/PaymentContext.php | 1 + .../Context/Setup/PimcoreClassContext.php | 1 + .../Behat/Context/Setup/ProductContext.php | 1 + .../Context/Setup/ProductPriceRuleContext.php | 1 + .../Setup/ProductQuantityPriceRuleContext.php | 1 + .../Setup/ProductSpecificPriceRuleContext.php | 1 + .../Context/Setup/ProductUnitContext.php | 1 + .../Behat/Context/Setup/RecycleBinContext.php | 1 + .../Behat/Context/Setup/ShippingContext.php | 1 + .../Behat/Context/Setup/StoreContext.php | 1 + .../Behat/Context/Setup/TaxRateContext.php | 1 + .../Context/Setup/TaxRuleGroupContext.php | 1 + .../Behat/Context/Setup/VariantContext.php | 1 + .../Behat/Context/Setup/VersionContext.php | 1 + .../Behat/Context/Setup/ZoneContext.php | 1 + .../Context/Transform/AddressContext.php | 1 + .../Behat/Context/Transform/CartContext.php | 1 + .../Transform/CartPriceRuleContext.php | 1 + .../Context/Transform/CategoryContext.php | 1 + .../Context/Transform/CountryContext.php | 1 + .../Context/Transform/CurrencyContext.php | 1 + .../Context/Transform/CustomerContext.php | 1 + .../Transform/CustomerGroupContext.php | 1 + .../Behat/Context/Transform/FilterContext.php | 1 + .../Transform/IndexConditionContext.php | 1 + .../Behat/Context/Transform/IndexContext.php | 1 + .../Context/Transform/ManufacturerContext.php | 1 + .../Behat/Context/Transform/OrderContext.php | 1 + .../Context/Transform/PaymentContext.php | 1 + .../Context/Transform/PimcoreClassContext.php | 1 + .../Context/Transform/ProductContext.php | 1 + .../Transform/ProductPriceRuleContext.php | 1 + .../ProductQuantityPriceRuleContext.php | 1 + .../ProductSpecificPriceRuleContext.php | 1 + .../Context/Transform/ProductUnitContext.php | 1 + .../Transform/SharedStorageContext.php | 1 + .../Context/Transform/ShippingContext.php | 1 + .../Behat/Context/Transform/StoreContext.php | 1 + .../Context/Transform/TaxRateContext.php | 1 + .../Context/Transform/TaxRuleGroupContext.php | 1 + .../Context/Transform/VariantContext.php | 1 + .../Context/Transform/VersionContext.php | 1 + .../Behat/Context/Transform/ZoneContext.php | 1 + .../Context/Ui/Domain/PaymentController.php | 1 + .../Behat/Context/Ui/Frontend/CartContext.php | 1 + .../Context/Ui/Frontend/CheckoutContext.php | 1 + .../Context/Ui/Frontend/CurrencyContext.php | 1 + .../Ui/Frontend/CustomerProfileContext.php | 1 + .../Context/Ui/Frontend/HomepageContext.php | 1 + .../Context/Ui/Frontend/LoginContext.php | 1 + .../Context/Ui/Frontend/ProductContext.php | 1 + .../Ui/Frontend/RegistrationContext.php | 1 + .../Context/Ui/Frontend/StoreContext.php | 1 + .../Behat/Context/Ui/Frontend/UserContext.php | 1 + .../Ui/Pimcore/CoreShop/CountryContext.php | 1 + .../Ui/Pimcore/CoreShop/CurrencyContext.php | 1 + .../Pimcore/CoreShop/ExchangeRateContext.php | 1 + .../Ui/Pimcore/CoreShop/StateContext.php | 1 + .../Ui/Pimcore/CoreShop/TaxRateContext.php | 1 + .../Pimcore/CoreShop/TaxRuleGroupContext.php | 1 + .../Ui/Pimcore/CoreShop/ZoneContext.php | 1 + .../Behat/Context/Ui/Pimcore/LoginContext.php | 1 + .../Behat/Context/Ui/Pimcore/MenuContext.php | 1 + .../Behat/Context/Ui/Pimcore/PWAContext.php | 1 + .../Behat/Element/AbstractElement.php | 1 + .../Frontend/Account/RegisterElement.php | 1 + .../Account/RegisterElementInterface.php | 1 + .../Behat/Element/Pimcore/MenuElement.php | 1 + .../Element/Pimcore/MenuElementInterface.php | 1 + .../Behat/Model/Index/TestIndexFields.php | 1 + .../Behat/Model/Lock/OptimisticLock.php | 1 + .../Page/Frontend/AbstractFrontendPage.php | 1 + .../Frontend/Account/ChangePasswordPage.php | 1 + .../Account/ChangePasswordPageInterface.php | 1 + .../Frontend/Account/ChangeProfilePage.php | 1 + .../Account/ChangeProfilePageInterface.php | 1 + .../Behat/Page/Frontend/Account/LoginPage.php | 1 + .../Frontend/Account/LoginPageInterface.php | 1 + .../Page/Frontend/Account/ProfilePage.php | 1 + .../Frontend/Account/ProfilePageInterface.php | 1 + .../Page/Frontend/Account/RegisterPage.php | 1 + .../Account/RegisterPageInterface.php | 1 + .../Account/RequestPasswordResetPage.php | 1 + .../RequestPasswordResetPageInterface.php | 1 + src/CoreShop/Behat/Page/Frontend/CartPage.php | 1 + .../Behat/Page/Frontend/CartPageInterface.php | 1 + .../Page/Frontend/Checkout/AddressPage.php | 1 + .../Checkout/AddressPageInterface.php | 1 + .../Page/Frontend/Checkout/CustomerPage.php | 1 + .../Checkout/CustomerPageInterface.php | 1 + .../Page/Frontend/Checkout/PaymentPage.php | 1 + .../Checkout/PaymentPageInterface.php | 1 + .../Page/Frontend/Checkout/ShippingPage.php | 1 + .../Checkout/ShippingPageInterface.php | 1 + .../Page/Frontend/Checkout/SummaryPage.php | 1 + .../Checkout/SummaryPageInterface.php | 1 + .../Page/Frontend/Checkout/ThankYouPage.php | 1 + .../Checkout/ThankYouPageInterface.php | 1 + .../Page/Frontend/FrontendPageInterface.php | 1 + src/CoreShop/Behat/Page/Frontend/HomePage.php | 1 + .../Behat/Page/Frontend/HomePageInterface.php | 1 + .../Behat/Page/Frontend/ProductPage.php | 1 + .../Page/Frontend/ProductPageInterface.php | 1 + .../Page/Frontend/SluggablePageTrait.php | 1 + .../Pimcore/AbstractCoreShopResourcePage.php | 1 + .../Page/Pimcore/AbstractPimcorePage.php | 1 + .../Page/Pimcore/AbstractPimcoreTabPage.php | 1 + .../Page/Pimcore/CoreShop/CountryPage.php | 1 + .../Pimcore/CoreShop/CountryPageInterface.php | 1 + .../Page/Pimcore/CoreShop/CurrencyPage.php | 1 + .../CoreShop/CurrencyPageInterface.php | 1 + .../Pimcore/CoreShop/ExchangeRatePage.php | 1 + .../CoreShop/ExchangeRatePageInterface.php | 1 + .../Behat/Page/Pimcore/CoreShop/StatePage.php | 1 + .../Pimcore/CoreShop/StatePageInterface.php | 1 + .../Page/Pimcore/CoreShop/TaxRatePage.php | 1 + .../Pimcore/CoreShop/TaxRatePageInterface.php | 1 + .../Pimcore/CoreShop/TaxRuleGroupPage.php | 1 + .../CoreShop/TaxRuleGroupPageInterface.php | 1 + .../Behat/Page/Pimcore/CoreShop/ZonePage.php | 1 + .../Pimcore/CoreShop/ZonePageInterface.php | 1 + .../Pimcore/CoreShopResourcePageInterface.php | 1 + src/CoreShop/Behat/Page/Pimcore/LoginPage.php | 1 + .../Behat/Page/Pimcore/LoginPageInterface.php | 1 + src/CoreShop/Behat/Page/Pimcore/PWAPage.php | 1 + .../Behat/Page/Pimcore/PWAPageInterface.php | 1 + .../Page/Pimcore/PimcorePageInterface.php | 1 + .../Page/Pimcore/PimcoreTabPageInterface.php | 1 + src/CoreShop/Behat/Service/ClassStorage.php | 1 + .../Behat/Service/ClassStorageInterface.php | 1 + .../CompilerPass/MonologChannelLoggerPass.php | 1 + ...figurationBasedDisplayFractionProvider.php | 1 + src/CoreShop/Behat/Service/CookieSetter.php | 1 + .../Behat/Service/CookieSetterInterface.php | 1 + .../CustomRelationalIndexInterpreter.php | 1 + ...tificationExpectationMismatchException.php | 1 + .../Service/Index/IndexColumnExtension.php | 1 + .../Index/RelationalIndexExtension.php | 1 + .../Behat/Service/JavascriptHelper.php | 1 + .../Behat/Service/NotificationAccessor.php | 1 + .../Service/NotificationAccessorInterface.php | 1 + .../Behat/Service/NotificationChecker.php | 1 + .../Service/NotificationCheckerInterface.php | 1 + .../Behat/Service/NotificationType.php | 1 + .../Concurrency/Action/CaptureAction.php | 1 + .../Action/ConvertPaymentAction.php | 1 + .../Payum/Concurrency/Action/NotifyAction.php | 1 + .../Payum/Concurrency/Action/StatusAction.php | 1 + .../Concurrency/ConcurrencyGatewayFactory.php | 1 + .../Behat/Service/PimcoreCookieSetter.php | 1 + .../Behat/Service/PimcoreSecurityService.php | 1 + .../PimcoreSecurityServiceInterface.php | 1 + .../Service/Resolver/CurrentPageResolver.php | 1 + .../Resolver/CurrentPageResolverInterface.php | 1 + .../Behat/Service/SecurityService.php | 1 + .../Service/SecurityServiceInterface.php | 1 + src/CoreShop/Behat/Service/Setup.php | 1 + src/CoreShop/Behat/Service/SharedStorage.php | 1 + .../Behat/Service/SharedStorageInterface.php | 1 + .../Behat/Service/StoreContextSetter.php | 1 + .../Service/StoreContextSetterInterface.php | 1 + .../Behat/Service/Tracking/ConfigResolver.php | 1 + .../Collector/CountryCollector.php | 1 + .../Controller/CountryController.php | 1 + .../CoreExtension/AddressIdentifier.php | 1 + .../AddressBundle/CoreExtension/Country.php | 1 + .../CoreExtension/CountryMultiselect.php | 1 + .../AddressBundle/CoreExtension/State.php | 1 + .../AddressBundle/CoreShopAddressBundle.php | 1 + .../Compiler/CompositeCountryContextPass.php | 1 + .../Compiler/CompositeRequestResolverPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopAddressExtension.php | 1 + .../ORM/AddressIdentifierRepository.php | 1 + .../Doctrine/ORM/CountryRepository.php | 1 + .../Form/Type/AddressIdentifierChoiceType.php | 1 + .../Form/Type/AddressIdentifierType.php | 1 + .../AddressBundle/Form/Type/AddressType.php | 1 + .../Form/Type/CountryChoiceType.php | 1 + .../Form/Type/CountryTranslationType.php | 1 + .../AddressBundle/Form/Type/CountryType.php | 1 + .../Form/Type/SalutationChoiceType.php | 1 + .../Form/Type/StateChoiceType.php | 1 + .../Form/Type/StateTranslationType.php | 1 + .../AddressBundle/Form/Type/StateType.php | 1 + .../Form/Type/ZoneChoiceType.php | 1 + .../AddressBundle/Form/Type/ZoneType.php | 1 + .../Twig/FormatAddressExtension.php | 1 + .../Constraints/ValidAddressIdentifier.php | 1 + .../ValidAddressIdentifierValidator.php | 1 + .../Controller/ConfigurationController.php | 1 + .../CoreShopConfigurationBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopConfigurationExtension.php | 1 + .../Doctrine/ORM/ConfigurationRepository.php | 1 + .../Form/Type/ConfigurationCollectionType.php | 1 + .../Form/Type/ConfigurationType.php | 1 + .../Serialization/ObjectHandler.php | 1 + .../Bundle/CoreBundle/Application/Version.php | 1 + .../Checkout/Step/AddressCheckoutStep.php | 1 + .../Step/CustomerAddressCheckoutStep.php | 1 + .../Checkout/Step/CustomerCheckoutStep.php | 1 + .../Step/GuestAddressCheckoutStep.php | 1 + .../Checkout/Step/PaymentCheckoutStep.php | 1 + .../Checkout/Step/ShippingCheckoutStep.php | 1 + .../Checkout/Step/SummaryCheckoutStep.php | 1 + .../Collector/CurrencyCollector.php | 1 + .../Command/AbstractInstallCommand.php | 1 + .../CoreBundle/Command/InstallCommand.php | 1 + .../Command/InstallDatabaseCommand.php | 1 + .../CoreBundle/Command/InstallDemoCommand.php | 1 + .../Command/InstallFixturesCommand.php | 1 + .../Command/InstallFoldersCommand.php | 1 + .../Command/InstallResourcesCommand.php | 1 + .../CoreBundle/Command/MigrateCommand.php | 1 + .../Command/MigrationGenerateCommand.php | 1 + .../Controller/ConfigurationController.php | 1 + .../CustomerTransformerController.php | 1 + .../CoreBundle/Controller/OrderController.php | 1 + .../Controller/OrderCreationController.php | 1 + .../Controller/PortletsController.php | 1 + .../Controller/ProductController.php | 1 + .../Controller/ProductPreviewController.php | 1 + .../ProductValidationController.php | 1 + ...ProductVariantUnitSolidifierController.php | 1 + .../Controller/ReportsController.php | 1 + .../Controller/SettingsController.php | 1 + .../CoreBundle/CoreExtension/StoreValues.php | 1 + .../Bundle/CoreBundle/CoreShopCoreBundle.php | 1 + .../CustomerAlreadyExistsException.php | 1 + .../Customer/CustomerLoginService.php | 1 + .../CustomerLoginServiceInterface.php | 1 + .../CoreBundle/Customer/CustomerManager.php | 1 + .../Customer/CustomerManagerInterface.php | 1 + .../RegisterIndexProductExtensionPass.php | 1 + .../Compiler/RegisterPortletsPass.php | 1 + .../Compiler/RegisterReportsPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopCoreExtension.php | 1 + .../Doctrine/ORM/CarrierRepository.php | 1 + .../Doctrine/ORM/ConfigurationRepository.php | 1 + .../Doctrine/ORM/CountryRepository.php | 1 + .../Doctrine/ORM/CurrencyRepository.php | 1 + .../ORM/PaymentProviderRepository.php | 1 + .../ORM/ProductStoreValuesRepository.php | 1 + .../Doctrine/ORM/TaxRuleRepository.php | 1 + .../Event/CustomerRegistrationEvent.php | 1 + .../RequestNewsletterConfirmationEvent.php | 1 + .../EventListener/AdminJavascriptListener.php | 1 + .../EventListener/CartBlamerListener.php | 1 + .../CustomerCompanyRelationListener.php | 1 + .../EventListener/CustomerLoginListener.php | 1 + .../CustomerNewsletterConfirmListener.php | 1 + .../CustomerOrderDeletionListener.php | 1 + .../CustomerSecurityValidationListener.php | 1 + .../AbstractNotificationRuleListener.php | 1 + .../NotificationRules/CustomerListener.php | 1 + .../OrderCommentsListener.php | 1 + .../OrderDocumentWorkflowListener.php | 1 + .../OrderWorkflowListener.php | 1 + .../PaymentWorkflowListener.php | 1 + ...rderDocumentWkhtmlPrintOptionsListener.php | 1 + .../Order/OrderMailNoteEventListener.php | 1 + .../PriceRuleUpdateEventListener.php | 1 + .../ProductAvailabilityEventListener.php | 1 + .../ProductStoreValuesAdminGetListener.php | 1 + .../ProductUpdateEventListener.php | 1 + .../QuantityRangeUnitValidationListener.php | 1 + .../EventListener/RequestCartAvailability.php | 1 + .../RequestCartRecalculation.php | 1 + .../EventListener/ShopUserLogoutHandler.php | 1 + .../Application/AddressIdentifierFixture.php | 1 + .../Data/Application/ConfigurationFixture.php | 1 + .../Data/Application/CountryFixture.php | 1 + .../Data/Application/CurrencyFixture.php | 1 + .../Application/NotificationRulesFixture.php | 1 + .../Data/Application/StoreFixture.php | 1 + .../Fixtures/Data/Application/ZoneFixture.php | 1 + .../Data/Demo/AbstractProductFixture.php | 1 + .../Data/Demo/AttributeGroupsFixture.php | 1 + .../Fixtures/Data/Demo/CarrierFixture.php | 1 + .../Fixtures/Data/Demo/CategoryFixture.php | 1 + .../Data/Demo/PaymentProviderFixture.php | 1 + .../Fixtures/Data/Demo/ProductFixture.php | 1 + .../Fixtures/Data/Demo/ProductUnitFixture.php | 1 + .../Demo/ProductWithAttributesFixture.php | 1 + .../Data/Demo/ProductWithUnitFixture.php | 1 + .../Data/Demo/ShippingRuleFixture.php | 1 + .../Data/Demo/ShippingRuleGroupFixture.php | 1 + .../Fixtures/Data/Demo/TaxRateFixture.php | 1 + .../Data/Demo/TaxRuleGroupFixture.php | 1 + .../Form/DataMapper/CustomerDataMapper.php | 1 + .../CustomerRegistrationFormSubscriber.php | 1 + .../Form/Extension/AddToCartTypeExtension.php | 1 + .../Form/Extension/AddressTypeExtension.php | 1 + .../Form/Extension/CarrierTypeExtension.php | 1 + .../CartCreationCartItemTypeExtension.php | 1 + .../Extension/CartCreationTypeExtension.php | 1 + .../Form/Extension/CartItemTypeExtension.php | 1 + .../Form/Extension/CartTypeExtension.php | 1 + .../Form/Extension/CountryTypeExtension.php | 1 + .../Form/Extension/CustomerTypeExtension.php | 1 + .../OrderShipmentCreationTypeExtension.php | 1 + .../PaymentProviderTypeExtension.php | 1 + ...ctQuantityRangeCollectionTypeExtension.php | 1 + .../ProductQuantityRangeTypeExtension.php | 1 + .../Form/Extension/StoreTypeExtension.php | 1 + .../Form/Extension/TaxRuleTypeExtension.php | 1 + .../Form/Type/AddressChoiceType.php | 1 + .../Form/Type/Checkout/AddressType.php | 1 + .../Form/Type/Checkout/CarrierChoiceType.php | 1 + .../Form/Type/Checkout/CarrierType.php | 1 + .../Form/Type/Checkout/GuestAddressType.php | 1 + .../Form/Type/Checkout/PaymentType.php | 1 + .../Form/Type/Checkout/SummaryType.php | 1 + .../Form/Type/CustomerRegistrationType.php | 1 + .../Form/Type/GuestRegistrationType.php | 1 + .../Action/OrderMailConfigurationType.php | 1 + .../Action/StoreMailConfigurationType.php | 1 + .../StoreOrderMailConfigurationType.php | 1 + .../BackendCreatedConfigurationType.php | 1 + .../InvoiceStateConfigurationType.php | 1 + .../OrderInvoiceStateConfigurationType.php | 1 + .../OrderPaymentStateConfigurationType.php | 1 + .../OrderSaleStateConfigurationType.php | 1 + .../OrderShippingStateConfigurationType.php | 1 + .../Condition/OrderStateConfigurationType.php | 1 + .../PaymentStateConfigurationType.php | 1 + .../Condition/QuoteStateConfigurationType.php | 1 + .../ShipmentStateConfigurationType.php | 1 + .../StateTransitionConfigurationType.php | 1 + .../Condition/StoresConfigurationType.php | 1 + .../Condition/UserTypeConfigurationType.php | 1 + .../Form/Type/Order/PaymentType.php | 1 + .../ProductStoreValuesSelectionType.php | 1 + .../Type/Product/ProductStoreValuesType.php | 1 + .../Condition/QuantityConfigurationType.php | 1 + .../Action/FreeShippingConfigurationType.php | 1 + .../Action/GiftProductConfigurationType.php | 1 + .../Condition/CarriersConfigurationType.php | 1 + .../Condition/CategoriesConfigurationType.php | 1 + .../Condition/CommentConfigurationType.php | 1 + .../Condition/CountriesConfigurationType.php | 1 + .../Condition/CurrenciesConfigurationType.php | 1 + .../CustomerGroupsConfigurationType.php | 1 + .../Condition/CustomersConfigurationType.php | 1 + .../Condition/ProductsConfigurationType.php | 1 + .../Condition/StoresConfigurationType.php | 1 + .../Condition/TimespanConfigurationType.php | 1 + .../Rule/Condition/ZonesConfigurationType.php | 1 + .../AdditionAmountActionConfigurationType.php | 1 + .../DiscountAmountActionConfigurationType.php | 1 + .../Action/PriceActionConfigurationType.php | 1 + .../Form/Type/UserRegistrationType.php | 1 + src/CoreShop/Bundle/CoreBundle/Installer.php | 1 + .../Checker/CommandDirectoryChecker.php | 1 + .../Installer/Executor/CommandExecutor.php | 1 + .../Executor/FolderInstallerProvider.php | 1 + .../DatabaseSetupCommandsProvider.php | 1 + ...DatabaseSetupCommandsProviderInterface.php | 1 + .../Maintenance/OrderExpireTask.php | 1 + .../Maintenance/RuleAvailabilityTask.php | 1 + .../CoreBundle/Menu/MainMenuBuilder.php | 1 + .../Migrations/Version20190605141526.php | 1 + .../Migrations/Version20191122074930.php | 1 + .../Migrations/Version20200206155318.php | 1 + .../Migrations/Version20200414153349.php | 1 + .../Migrations/Version20200415151505.php | 1 + .../Migrations/Version20200415152315.php | 1 + .../Migrations/Version20200415152607.php | 1 + .../Migrations/Version20200415152858.php | 1 + .../Migrations/Version20200415153309.php | 1 + .../Migrations/Version20200415153349.php | 1 + .../Migrations/Version20200415153636.php | 1 + .../Migrations/Version20200415153638.php | 1 + .../Migrations/Version20200415154821.php | 1 + .../Migrations/Version20200415160423.php | 1 + .../Migrations/Version20200415160746.php | 1 + .../Migrations/Version20200415160854.php | 1 + .../Migrations/Version20200415161210.php | 1 + .../Migrations/Version20200421105731.php | 1 + .../Migrations/Version20200617120130.php | 1 + .../Migrations/Version20210511074115.php | 1 + .../CoreBundle/Order/OrderMailProcessor.php | 1 + .../Operator/Factory/StorePriceFactory.php | 1 + .../GridColumnConfig/Operator/StorePrice.php | 1 + .../LinkGenerator/DataObjectLinkGenerator.php | 1 + .../Pimcore/Repository/CategoryRepository.php | 1 + .../Pimcore/Repository/CustomerRepository.php | 1 + .../Pimcore/Repository/ProductRepository.php | 1 + .../Pimcore/Repository/WishlistRepository.php | 1 + .../Report/AbandonedCartsReport.php | 1 + .../CoreBundle/Report/CarriersReport.php | 1 + .../Bundle/CoreBundle/Report/CartsReport.php | 1 + .../CoreBundle/Report/CategoriesReport.php | 1 + .../CoreBundle/Report/CustomersReport.php | 1 + .../CoreBundle/Report/ManufacturerReport.php | 1 + .../Report/PaymentProvidersReport.php | 1 + .../CoreBundle/Report/ProductsReport.php | 1 + .../Bundle/CoreBundle/Report/SalesReport.php | 1 + .../CoreBundle/Report/VouchersReport.php | 1 + .../Security/ObjectUserProvider.php | 1 + .../CoreBundle/Storage/CookieStorage.php | 1 + .../CoreBundle/Storage/SessionStorage.php | 1 + .../Test/Service/NotificationRuleListener.php | 1 + .../NotificationRuleListenerInterface.php | 1 + .../CoreBundle/Twig/AddToCartExtension.php | 1 + .../Twig/AddressAllocatorExtension.php | 1 + .../Twig/CheckoutIdentifierExtension.php | 1 + .../Twig/ConfigurationExtension.php | 1 + .../CoreBundle/Twig/ProductPriceExtension.php | 1 + ...tQuantityPriceRuleRangesPriceExtension.php | 1 + .../CoreBundle/Twig/ProductTaxExtension.php | 1 + .../Twig/TaxationDisplayProviderExtension.php | 1 + .../Twig/ValidPriceRulesExtension.php | 1 + .../Constraints/AddToCartAvailability.php | 1 + .../AddToCartAvailabilityValidator.php | 1 + .../Constraints/AddToCartMaximumQuantity.php | 1 + .../AddToCartMaximumQuantityValidator.php | 1 + .../Constraints/AddToCartMinimumQuantity.php | 1 + .../AddToCartMinimumQuantityValidator.php | 1 + .../Constraints/CartMaximumQuantity.php | 1 + .../CartMaximumQuantityValidator.php | 1 + .../Constraints/CartMinimumQuantity.php | 1 + .../CartMinimumQuantityValidator.php | 1 + .../Constraints/CartStockAvailability.php | 1 + .../CartStockAvailabilityValidator.php | 1 + .../QuantityRangePriceCurrencyAware.php | 1 + ...antityRangePriceCurrencyAwareValidator.php | 1 + .../Validator/Constraints/RegisteredUser.php | 1 + .../Constraints/RegisteredUserValidator.php | 1 + .../Validator/Constraints/UniqueCustomer.php | 1 + .../Constraints/UniqueCustomerValidator.php | 1 + .../Validator/QuantityValidatorService.php | 1 + .../Controller/CurrencyController.php | 1 + .../Controller/ExchangeRateController.php | 1 + .../CurrencyBundle/CoreExtension/Currency.php | 1 + .../CoreExtension/CurrencyMultiselect.php | 1 + .../CoreExtension/MoneyCurrency.php | 1 + .../CurrencyBundle/CoreShopCurrencyBundle.php | 1 + .../DataHub/QueryType/MoneyCurrency.php | 1 + .../Compiler/CompositeCurrencyContextPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopCurrencyExtension.php | 1 + .../Doctrine/ORM/CurrencyRepository.php | 1 + .../Doctrine/ORM/ExchangeRateRepository.php | 1 + .../Form/Type/CurrencyChoiceType.php | 1 + .../CurrencyBundle/Form/Type/CurrencyType.php | 1 + .../Form/Type/ExchangeRateType.php | 1 + .../Twig/ConvertCurrencyExtension.php | 1 + .../CurrencyBundle/Twig/CurrencyExtension.php | 1 + .../Twig/DisplayFractionExtension.php | 1 + .../Provider/RoleOptionsProvider.php | 1 + .../CustomerBundle/CoreShopCustomerBundle.php | 1 + .../Compiler/CompositeCustomerContextPass.php | 1 + .../Compiler/CompositeRequestResolverPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopCustomerExtension.php | 1 + .../Form/Type/ChangePasswordType.php | 1 + .../Form/Type/CustomerLoginType.php | 1 + .../Form/Type/CustomerSelectionType.php | 1 + .../CustomerBundle/Form/Type/CustomerType.php | 1 + .../Pimcore/Repository/CompanyRepository.php | 1 + .../Pimcore/Repository/CustomerRepository.php | 1 + .../Command/LoadDataFixturesCommand.php | 1 + .../FixtureBundle/CoreShopFixtureBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopFixtureExtension.php | 1 + .../FixtureBundle/Event/DataFixturesEvent.php | 1 + .../FixtureBundle/Event/FixturesEvents.php | 1 + .../AbstractEntityReferenceFixture.php | 1 + .../Fixture/DataFixturesExecutor.php | 1 + .../Fixture/DataFixturesExecutorInterface.php | 1 + .../LoadedFixtureVersionAwareInterface.php | 1 + .../Fixture/Loader/DataFixturesLoader.php | 1 + .../Fixture/Sorter/DataFixturesSorter.php | 1 + .../Fixture/UpdateDataFixturesFixture.php | 1 + .../Fixture/VersionedFixtureInterface.php | 1 + .../FixtureBundle/Model/DataFixture.php | 1 + .../Model/DataFixtureInterface.php | 1 + .../Repository/DataFixtureRepository.php | 1 + .../DataFixtureRepositoryInterface.php | 1 + .../Controller/CartController.php | 1 + .../Controller/CategoryController.php | 1 + .../Controller/CheckoutController.php | 1 + .../Controller/CurrencyController.php | 1 + .../Controller/CustomerController.php | 1 + .../Controller/FrontendController.php | 1 + .../Controller/IndexController.php | 1 + .../Controller/MailController.php | 1 + .../Controller/OrderController.php | 1 + .../Controller/ProductController.php | 1 + .../Controller/QuoteController.php | 1 + .../Controller/RegisterController.php | 1 + .../Controller/SearchController.php | 1 + .../Controller/SecurityController.php | 1 + .../FrontendBundle/CoreShopFrontendBundle.php | 1 + .../RegisterFrontendControllerPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopFrontendExtension.php | 1 + .../FrontendBundle/Form/Type/SearchType.php | 1 + .../TemplateConfigurator.php | 1 + .../TemplateConfiguratorInterface.php | 1 + .../Twig/LocaleSwitcherExtension.php | 1 + .../Twig/MergeRecursiveExtension.php | 1 + .../Twig/TestFormAttributeExtension.php | 1 + .../Twig/TestHtmlAttributeExtension.php | 1 + .../IndexBundle/Command/IndexCommand.php | 1 + .../Mysql/AbstractMysqlDynamicRenderer.php | 1 + .../Condition/Mysql/CompareRenderer.php | 1 + .../Condition/Mysql/ConcatRenderer.php | 1 + .../Condition/Mysql/InRenderer.php | 1 + .../Condition/Mysql/IsNullRenderer.php | 1 + .../Condition/Mysql/IsRenderer.php | 1 + .../Condition/Mysql/LikeRenderer.php | 1 + .../Condition/Mysql/RangeRenderer.php | 1 + .../Controller/FilterController.php | 1 + .../Controller/IndexController.php | 1 + .../IndexBundle/CoreExtension/Filter.php | 1 + .../IndexBundle/CoreShopIndexBundle.php | 1 + .../Compiler/RegisterColumnTypePass.php | 1 + .../RegisterConditionRendererTypesPass.php | 1 + .../Compiler/RegisterExtensionsPass.php | 1 + .../RegisterFilterConditionTypesPass.php | 1 + .../RegisterFilterPreConditionTypesPass.php | 1 + .../RegisterFilterUserConditionTypesPass.php | 1 + .../Compiler/RegisterGetterPass.php | 1 + .../Compiler/RegisterIndexWorkerPass.php | 1 + .../Compiler/RegisterInterpreterPass.php | 1 + .../RegisterOrderRendererTypesPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopIndexExtension.php | 1 + .../EventListener/AdminJavascriptListener.php | 1 + .../EventListener/CreateIndexListener.php | 1 + .../EventListener/DeleteIndexListener.php | 1 + .../EventListener/IndexObjectListener.php | 1 + .../EventListener/UpdateIndexListener.php | 1 + .../MysqlIndexQueryExtensionInterface.php | 1 + .../Factory/FilteredListingFactory.php | 1 + .../IndexBundle/Factory/ListingFactory.php | 1 + .../Form/DataMapper/ConditionsFormMapper.php | 1 + ...ractConfigurableIndexColumnElementType.php | 1 + ...IndexColumnTypeClassificationStoreType.php | 1 + .../IndexColumnTypeFieldCollectionType.php | 1 + .../IndexColumnTypeLocalizedFieldsType.php | 1 + .../Column/IndexColumnTypeObjectBrickType.php | 1 + .../Type/Column/IndexColumnTypeObjectType.php | 1 + .../Type/Column/IndexColumnTypeSystemType.php | 1 + .../AbstractConfigurationCollectionType.php | 1 + .../Form/Type/EmptyConfigurationFormType.php | 1 + .../Filter/FilterConditionBooleanType.php | 1 + ...FilterConditionCategoryMultiSelectType.php | 1 + .../FilterConditionCategorySelectType.php | 1 + .../Filter/FilterConditionMultiselectType.php | 1 + .../Type/Filter/FilterConditionRangeType.php | 1 + .../Type/Filter/FilterConditionSelectType.php | 1 + .../Filter/FilterPreConditionNestedType.php | 1 + .../Filter/FilterUserConditionNestedType.php | 1 + .../Form/Type/FilterConditionChoiceType.php | 1 + .../Form/Type/FilterConditionType.php | 1 + .../Type/FilterPreConditionChoiceType.php | 1 + .../Type/FilterPreConditionCollectionType.php | 1 + .../Form/Type/FilterPreConditionType.php | 1 + .../IndexBundle/Form/Type/FilterType.php | 1 + .../Type/FilterUserConditionChoiceType.php | 1 + .../FilterUserConditionCollectionType.php | 1 + .../Form/Type/FilterUserConditionType.php | 1 + .../Form/Type/Getter/BrickGetterFormType.php | 1 + .../ClassificationStoreGetterFormType.php | 1 + .../Getter/FieldCollectionGetterFormType.php | 1 + .../IndexBundle/Form/Type/IndexChoiceType.php | 1 + .../Form/Type/IndexColumnChoiceType.php | 1 + .../Form/Type/IndexColumnCollectionType.php | 1 + .../Form/Type/IndexColumnGetterChoiceType.php | 1 + .../Type/IndexColumnInterpreterChoiceType.php | 1 + .../IndexBundle/Form/Type/IndexColumnType.php | 1 + .../IndexBundle/Form/Type/IndexType.php | 1 + .../Form/Type/IndexWorkerChoiceType.php | 1 + .../ExpressionInterpreterFormType.php | 1 + .../Interpreter/InterpreterCollectionType.php | 1 + .../Form/Type/Interpreter/InterpreterType.php | 1 + .../Interpreter/IteratorInterpreterType.php | 1 + .../Interpreter/NestedInterpreterType.php | 1 + .../ObjectPropertyInterpreterFormType.php | 1 + .../Type/Worker/MysqlWorkerTableIndexType.php | 1 + .../Form/Type/Worker/MysqlWorkerType.php | 1 + src/CoreShop/Bundle/IndexBundle/Installer.php | 1 + .../IndexBundle/Menu/IndexMenuBuilder.php | 1 + .../Migrations/Version20200224161101.php | 1 + .../Migrations/Version20220121154623.php | 1 + .../Mysql/AbstractMysqlDynamicRenderer.php | 1 + .../Order/Mysql/SimpleOrderRenderer.php | 1 + .../Form/Type/CoreShopIndexProcessType.php | 1 + .../ProcessManager/IndexListener.php | 1 + .../ProcessManager/IndexProcess.php | 1 + .../IndexBundle/Worker/AbstractListing.php | 1 + .../IndexBundle/Worker/AbstractWorker.php | 1 + .../Bundle/IndexBundle/Worker/MysqlWorker.php | 1 + .../Worker/MysqlWorker/Listing.php | 1 + .../Worker/MysqlWorker/Listing/Dao.php | 1 + .../Worker/MysqlWorker/TableIndex.php | 1 + .../CoreShopInventoryBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopInventoryExtension.php | 1 + .../Twig/InventoryExtension.php | 1 + .../Validator/Constraints/InStock.php | 1 + .../Constraints/InStockValidator.php | 1 + .../LocaleBundle/CoreShopLocaleBundle.php | 1 + .../Compiler/CompositeLocaleContextPass.php | 1 + .../CoreShopLocaleExtension.php | 1 + .../Form/Type/LocaleChoiceType.php | 1 + src/CoreShop/Bundle/MenuBundle/Builder.php | 1 + .../Builder/MenuBuilderInterface.php | 1 + .../MenuBundle/Controller/MenuController.php | 1 + .../Bundle/MenuBundle/CoreShopMenuBundle.php | 1 + .../CompilerPass/MenuBuilderPass.php | 1 + .../CoreShopMenuExtension.php | 1 + .../EventListener/PimcoreAdminListener.php | 1 + .../Bundle/MenuBundle/Guard/PimcoreGuard.php | 1 + .../MenuBundle/Renderer/JsonRenderer.php | 1 + .../MoneyBundle/CoreExtension/Money.php | 1 + .../MoneyBundle/CoreShopMoneyBundle.php | 1 + .../MoneyBundle/DataHub/QueryType/Money.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopMoneyExtension.php | 1 + .../Transformer/MoneyToIntegerTransformer.php | 1 + .../MoneyBundle/Form/Type/MoneyType.php | 1 + .../MoneyBundle/Formatter/MoneyFormatter.php | 1 + .../MoneyBundle/Twig/FormatMoneyExtension.php | 1 + .../Controller/NotificationRuleController.php | 1 + .../CoreShopNotificationBundle.php | 1 + .../Compiler/AbstractNotificationRulePass.php | 1 + .../Compiler/NotificationRuleActionPass.php | 1 + .../NotificationRuleConditionPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopNotificationExtension.php | 1 + .../ORM/NotificationRuleRepository.php | 1 + .../NotificationRuleEventListener.php | 1 + .../Bundle/NotificationBundle/Events.php | 1 + .../Type/NotificationRuleActionChoiceType.php | 1 + .../NotificationRuleActionCollectionType.php | 1 + .../Form/Type/NotificationRuleActionType.php | 1 + .../NotificationRuleConditionChoiceType.php | 1 + ...otificationRuleConditionCollectionType.php | 1 + .../Type/NotificationRuleConditionType.php | 1 + .../Form/Type/NotificationRuleType.php | 1 + .../Type/NotificationRuleTypeChoiceType.php | 1 + .../Action/MailActionConfigurationType.php | 1 + .../Processor/EventedRuleProcessor.php | 1 + .../CoreShopOptimisticEntityLockBundle.php | 1 + .../CoreShopOptimisticEntityLockExtension.php | 1 + .../EventListener/LockListener.php | 1 + .../Exception/OptimisticLockException.php | 1 + .../Manager/EntityLockManager.php | 1 + .../Manager/EntityLockManagerInterface.php | 1 + .../Model/OptimisticLockedInterface.php | 1 + .../OrderBundle/Collector/CartCollector.php | 1 + .../OrderBundle/Command/CartExpireCommand.php | 1 + .../Command/OrderExpireCommand.php | 1 + .../Controller/AddressCreationController.php | 1 + .../Controller/CartPriceRuleController.php | 1 + .../Controller/CustomerCreationController.php | 1 + .../Controller/OrderCommentController.php | 1 + .../Controller/OrderController.php | 1 + .../Controller/OrderCreationController.php | 1 + .../OrderDocumentPrintController.php | 1 + .../Controller/OrderEditController.php | 1 + .../Controller/OrderInvoiceController.php | 1 + .../Controller/OrderPaymentController.php | 1 + .../Controller/OrderShipmentController.php | 1 + .../CoreExtension/CartPriceRule.php | 1 + .../OrderBundle/CoreShopOrderBundle.php | 1 + .../OrderBundle/DTO/AddMultipleToCart.php | 1 + .../DTO/AddMultipleToCartInterface.php | 1 + .../Bundle/OrderBundle/DTO/AddToCart.php | 1 + .../OrderBundle/DTO/AddToCartInterface.php | 1 + .../Compiler/CartItemPriceRuleActionPass.php | 1 + .../CartItemPriceRuleConditionPass.php | 1 + .../Compiler/CartPriceRuleActionPass.php | 1 + .../Compiler/CartPriceRuleConditionPass.php | 1 + .../PurchasableDiscountCalculatorsPass.php | 1 + ...urchasableDiscountPriceCalculatorsPass.php | 1 + .../PurchasablePriceCalculatorsPass.php | 1 + .../PurchasableRetailPriceCalculatorsPass.php | 1 + ...rchasableWholesalePriceCalculatorsPass.php | 1 + .../Compiler/RegisterCartProcessorPass.php | 1 + .../RegisterWorkflowValidatorPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopOrderExtension.php | 1 + .../Doctrine/ORM/CartPriceRuleRepository.php | 1 + .../ORM/CartPriceRuleVoucherRepository.php | 1 + .../Event/AdminAddressCreationEvent.php | 1 + .../Event/AdminCustomerCreationEvent.php | 1 + .../OrderBundle/Event/WkhtmlOptionsEvent.php | 1 + .../CheckoutCartLocaleAssignerListener.php | 1 + .../EventListener/Grid/CartFilterListener.php | 1 + .../EventListener/SessionCartSubscriber.php | 1 + src/CoreShop/Bundle/OrderBundle/Events.php | 1 + .../OrderBundle/Expiration/CartExpiration.php | 1 + .../Expiration/OrderExpiration.php | 1 + .../Expiration/OrderExpirationInterface.php | 1 + .../Factory/AddMultipleToCartFactory.php | 1 + .../AddMultipleToCartFactoryInterface.php | 1 + .../OrderBundle/Factory/AddToCartFactory.php | 1 + .../Factory/AddToCartFactoryInterface.php | 1 + .../DataMapper/CartItemQuantityDataMapper.php | 1 + .../Form/Type/AddMultipleToCartType.php | 1 + .../OrderBundle/Form/Type/AddToCartType.php | 1 + .../Form/Type/AdminAddressCreationType.php | 1 + .../Form/Type/AdminCustomerCreationType.php | 1 + .../Form/Type/CartCreationCartItemType.php | 1 + .../Form/Type/CartCreationType.php | 1 + .../CartItemPriceRuleActionChoiceType.php | 1 + .../CartItemPriceRuleActionCollectionType.php | 1 + .../Form/Type/CartItemPriceRuleActionType.php | 1 + .../CartItemPriceRuleConditionChoiceType.php | 1 + ...rtItemPriceRuleConditionCollectionType.php | 1 + .../Type/CartItemPriceRuleConditionType.php | 1 + .../OrderBundle/Form/Type/CartItemType.php | 1 + .../Type/CartPriceRuleActionChoiceType.php | 1 + .../CartPriceRuleActionCollectionType.php | 1 + .../Form/Type/CartPriceRuleActionType.php | 1 + .../Form/Type/CartPriceRuleChoiceType.php | 1 + .../Type/CartPriceRuleConditionChoiceType.php | 1 + .../CartPriceRuleConditionCollectionType.php | 1 + .../Form/Type/CartPriceRuleConditionType.php | 1 + .../Type/CartPriceRuleTranslationType.php | 1 + .../Form/Type/CartPriceRuleType.php | 1 + .../Bundle/OrderBundle/Form/Type/CartType.php | 1 + .../Form/Type/EditCartItemsCollectionType.php | 1 + .../OrderBundle/Form/Type/EditCartType.php | 1 + .../Type/OrderInvoiceCreationItemsType.php | 1 + .../Form/Type/OrderInvoiceCreationType.php | 1 + .../Type/OrderShipmentCreationItemsType.php | 1 + .../Form/Type/OrderShipmentCreationType.php | 1 + .../Form/Type/PurchasableSelectionType.php | 1 + .../OrderBundle/Form/Type/QuantityType.php | 1 + .../CartItemActionConfigurationType.php | 1 + .../DiscountAmountConfigurationType.php | 1 + .../DiscountPercentConfigurationType.php | 1 + .../SurchargeAmountConfigurationType.php | 1 + .../SurchargePercentConfigurationType.php | 1 + .../Condition/AmountConfigurationType.php | 1 + .../Condition/NestedConfigurationType.php | 1 + .../Condition/TimespanConfigurationType.php | 1 + .../Condition/VoucherConfigurationType.php | 1 + .../Form/Type/ShippingCalculatorType.php | 1 + .../Form/Type/VoucherGeneratorType.php | 1 + .../OrderBundle/Form/Type/VoucherType.php | 1 + .../OrderBundle/Manager/CartManager.php | 1 + .../Operator/Factory/OrderStateFactory.php | 1 + .../Factory/PriceFormatterFactory.php | 1 + .../GridColumnConfig/Operator/OrderState.php | 1 + .../Operator/PriceFormatter.php | 1 + .../AbstractOrderDocumentRepository.php | 1 + .../Pimcore/Repository/CartItemRepository.php | 1 + .../Repository/OrderInvoiceRepository.php | 1 + .../Repository/OrderItemRepository.php | 1 + .../Pimcore/Repository/OrderRepository.php | 1 + .../Repository/OrderShipmentRepository.php | 1 + .../AssetOrderDocumentPdfRenderer.php | 1 + .../Renderer/OrderDocumentPdfRenderer.php | 1 + .../Renderer/Pdf/PdfRendererInterface.php | 1 + .../OrderBundle/Renderer/Pdf/WkHtmlToPdf.php | 1 + .../OrderInvoiceStateResolver.php | 1 + .../OrderPaymentStateResolver.php | 1 + .../OrderShippingStateResolver.php | 1 + .../StateResolver/OrderStateResolver.php | 1 + .../OrderBundle/Twig/OrderStateExtension.php | 1 + .../Validator/Constraints/CartPriceRule.php | 1 + .../Constraints/CartPriceRuleValidator.php | 1 + .../Validator/Constraints/VoucherAmount.php | 1 + .../Constraints/VoucherAmountValidator.php | 1 + .../CoreExtension/PaymentProvider.php | 1 + .../PaymentProviderMultiselect.php | 1 + .../PaymentBundle/CoreShopPaymentBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopPaymentExtension.php | 1 + .../ORM/PaymentProviderRepository.php | 1 + .../Doctrine/ORM/PaymentRepository.php | 1 + .../Form/Type/PaymentProviderChoiceType.php | 1 + .../Type/PaymentProviderTranslationType.php | 1 + .../Form/Type/PaymentProviderType.php | 1 + .../Action/AuthorizePaymentAction.php | 1 + .../Action/CapturePaymentAction.php | 1 + .../PayumBundle/Action/ConfirmOrderAction.php | 1 + ...uteSameRequestWithPaymentDetailsAction.php | 1 + .../Action/Offline/ConfirmOrderAction.php | 1 + .../Action/Offline/ConvertPaymentAction.php | 1 + .../Action/Offline/ResolveNextRouteAction.php | 1 + .../Action/Offline/StatusAction.php | 1 + .../ExpressCheckout/ConvertPaymentAction.php | 1 + .../Action/ResolveNextRouteAction.php | 1 + .../Controller/PaymentController.php | 1 + .../Bundle/PayumBundle/CoreGatewayFactory.php | 1 + .../PayumBundle/CoreGatewayFactoryBuilder.php | 1 + .../PayumBundle/CoreShopPayumBundle.php | 1 + .../Compiler/PayumReplyToSymfonyPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopPayumExtension.php | 1 + .../EventListener/TransactionListener.php | 1 + .../PayumBundle/Exception/ReplyException.php | 1 + .../ReplyToSymfonyResponseConverter.php | 1 + .../Extension/UpdateOrderStateExtension.php | 1 + .../Extension/UpdatePaymentStateExtension.php | 1 + .../Factory/ConfirmOrderFactory.php | 1 + .../Factory/ConfirmOrderFactoryInterface.php | 1 + .../PayumBundle/Factory/GetStatusFactory.php | 1 + .../Factory/GetStatusFactoryInterface.php | 1 + .../Factory/ResolveNextRouteFactory.php | 1 + .../ResolveNextRouteFactoryInterface.php | 1 + .../Type/PaypalGatewayConfigurationType.php | 1 + .../Type/SofortGatewayConfigurationType.php | 1 + .../PayumBundle/Request/ConfirmOrder.php | 1 + .../Request/ConfirmOrderInterface.php | 1 + .../Bundle/PayumBundle/Request/GetStatus.php | 1 + .../PayumBundle/Request/ResolveNextRoute.php | 1 + .../Request/ResolveNextRouteInterface.php | 1 + .../PayumBundle/Storage/LockingStorage.php | 1 + .../Controller/PaymentProviderController.php | 1 + .../CoreShopPayumPaymentBundle.php | 1 + .../RegisterGatewayConfigTypePass.php | 1 + .../RegisterPaymentSettingsFormsPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopPayumPaymentExtension.php | 1 + .../Event/PaymentProviderSupportsEvent.php | 1 + .../Bundle/PayumPaymentBundle/Events.php | 1 + .../PaymentProviderChoiceTypeExtension.php | 1 + .../PaymentProviderTypeExtension.php | 1 + .../Form/Type/GatewayConfigType.php | 1 + .../EventBasedPaymentProviderResolver.php | 1 + .../Command/AppMigrateCommand.php | 1 + .../Command/AppMigrationGenerateCommand.php | 1 + .../Admin/DynamicDropdownController.php | 1 + .../Controller/Admin/GridController.php | 1 + .../CoreExtension/DynamicDropdown.php | 1 + .../CoreExtension/DynamicDropdownMultiple.php | 1 + .../CoreExtension/DynamicDropdownTrait.php | 1 + .../CoreExtension/ItemSelector.php | 1 + .../CoreExtension/SerializedData.php | 1 + .../CoreExtension/SuperBoxSelect.php | 1 + .../PimcoreBundle/CoreShopPimcoreBundle.php | 1 + .../DataHub/QueryType/SerializedData.php | 1 + .../DataHub/Type/SerializedDataType.php | 1 + .../ExpressionLanguageServicePass.php | 1 + .../Compiler/RegisterGridActionPass.php | 1 + .../Compiler/RegisterGridFilterPass.php | 1 + .../RegisterImplementationLoaderPass.php | 1 + ...oreDocumentTagImplementationLoaderPass.php | 1 + .../RegisterPimcoreDocumentTagPass.php | 1 + .../RegisterTypeHintRegistriesPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopPimcoreExtension.php | 1 + .../Extension/AbstractPimcoreExtension.php | 1 + .../Bundle/PimcoreBundle/Event/MailEvent.php | 1 + .../EventListener/AdminJavascriptListener.php | 1 + .../Grid/ObjectListFilterListener.php | 1 + .../EventListener/SluggableListener.php | 1 + src/CoreShop/Bundle/PimcoreBundle/Events.php | 1 + ...ependencyInjectionImplementationLoader.php | 1 + .../PimcoreBundle/Mail/MailProcessor.php | 1 + .../Controller/ProductPriceRuleController.php | 1 + .../ProductUnitDefinitionsController.php | 1 + .../ProductSpecificPriceRules.php | 1 + .../CoreExtension/ProductUnit.php | 1 + .../CoreExtension/ProductUnitDefinition.php | 1 + .../CoreExtension/ProductUnitDefinitions.php | 1 + .../ProductBundle/CoreShopProductBundle.php | 1 + .../ProductDiscountCalculatorsPass.php | 1 + .../ProductDiscountPriceCalculatorsPass.php | 1 + .../Compiler/ProductPriceRuleActionPass.php | 1 + .../ProductPriceRuleConditionPass.php | 1 + .../ProductRetailPriceCalculatorsPass.php | 1 + .../ProductSpecificPriceRuleActionPass.php | 1 + .../ProductSpecificPriceRuleConditionPass.php | 1 + .../ProductValidPriceRuleFetcherPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopProductExtension.php | 1 + .../Doctrine/ORM/PriceRuleRepository.php | 1 + .../ORM/ProductPriceRuleRepository.php | 1 + .../ProductSpecificPriceRuleRepository.php | 1 + .../ORM/ProductUnitDefinitionsRepository.php | 1 + .../Doctrine/ORM/ProductUnitRepository.php | 1 + .../CategoryPersistEventListener.php | 1 + .../ClearCachedPriceRulesListener.php | 1 + .../EventListener/ProductDeleteListener.php | 1 + .../Type/ProductPriceRuleActionChoiceType.php | 1 + .../ProductPriceRuleActionCollectionType.php | 1 + .../Form/Type/ProductPriceRuleActionType.php | 1 + .../ProductPriceRuleConditionChoiceType.php | 1 + ...roductPriceRuleConditionCollectionType.php | 1 + .../Type/ProductPriceRuleConditionType.php | 1 + .../Type/ProductPriceRuleTranslationType.php | 1 + .../Form/Type/ProductPriceRuleType.php | 1 + .../Form/Type/ProductSelectionType.php | 1 + ...oductSpecificPriceRuleActionChoiceType.php | 1 + ...tSpecificPriceRuleActionCollectionType.php | 1 + .../ProductSpecificPriceRuleActionType.php | 1 + ...ctSpecificPriceRuleConditionChoiceType.php | 1 + ...ecificPriceRuleConditionCollectionType.php | 1 + .../ProductSpecificPriceRuleConditionType.php | 1 + ...roductSpecificPriceRuleTranslationType.php | 1 + .../Type/ProductSpecificPriceRuleType.php | 1 + .../DiscountAmountConfigurationType.php | 1 + .../DiscountPercentConfigurationType.php | 1 + .../Rule/Action/PriceConfigurationType.php | 1 + .../ProductPriceNestedConfigurationType.php | 1 + ...ctSpecificPriceNestedConfigurationType.php | 1 + .../Condition/TimespanConfigurationType.php | 1 + .../Form/Type/Unit/ProductUnitChoiceType.php | 1 + .../ProductUnitDefinitionCollectionType.php | 1 + ...oductUnitDefinitionPriceCollectionType.php | 1 + .../Unit/ProductUnitDefinitionPriceType.php | 1 + .../ProductUnitDefinitionSelectionType.php | 1 + .../Type/Unit/ProductUnitDefinitionType.php | 1 + .../Unit/ProductUnitDefinitionsChoiceType.php | 1 + .../Type/Unit/ProductUnitDefinitionsType.php | 1 + .../Type/Unit/ProductUnitTranslationType.php | 1 + .../Form/Type/Unit/ProductUnitType.php | 1 + .../Pimcore/Repository/CategoryRepository.php | 1 + .../Pimcore/Repository/ProductRepository.php | 1 + .../ProductQuantityPriceRules.php | 1 + ...oreShopProductQuantityPriceRulesBundle.php | 1 + .../ProductQuantityPriceRulesActionPass.php | 1 + ...roductQuantityPriceRulesCalculatorPass.php | 1 + ...ProductQuantityPriceRulesConditionPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + ...ShopProductQuantityPriceRulesExtension.php | 1 + .../ProductQuantityPriceRuleRepository.php | 1 + ...roductQuantityPriceRuleValidationEvent.php | 1 + ...ctQuantityPriceRuleConditionChoiceType.php | 1 + ...antityPriceRuleConditionCollectionType.php | 1 + .../ProductQuantityPriceRuleConditionType.php | 1 + .../Type/ProductQuantityPriceRuleType.php | 1 + .../ProductQuantityRangeCollectionType.php | 1 + .../Form/Type/ProductQuantityRangeType.php | 1 + ...antityPriceRuleNestedConfigurationType.php | 1 + .../Condition/TimespanConfigurationType.php | 1 + ...roductQuantityPriceRuleRangesExtension.php | 1 + .../ResourceBundle/AbstractResourceBundle.php | 1 + .../Command/CreateDatabaseTablesCommand.php | 1 + .../Command/DropDatabaseTablesCommand.php | 1 + .../Command/InstallResourcesCommand.php | 1 + .../ComposerPackageBundleInterface.php | 1 + .../Controller/AdminController.php | 1 + .../Controller/EventDispatcher.php | 1 + .../Controller/EventDispatcherInterface.php | 1 + .../Controller/PimcoreController.php | 1 + .../Controller/ResourceController.php | 1 + .../Controller/ResourceFormFactory.php | 1 + .../ResourceFormFactoryInterface.php | 1 + .../Controller/ResourceSettingsController.php | 1 + .../ResourceBundle/Controller/ViewHandler.php | 1 + .../Controller/ViewHandlerInterface.php | 1 + .../CoreExtension/CoreShopRelation.php | 1 + .../CoreExtension/CoreShopRelations.php | 1 + .../CoreExtension/Document/Select.php | 1 + .../CoreExtension/Multiselect.php | 1 + .../ResourceBundle/CoreExtension/Select.php | 1 + .../CoreExtension/TempEntityManagerTrait.php | 1 + .../ResourceBundle/CoreShopResourceBundle.php | 1 + .../DataHub/QueryType/Multiselect.php | 1 + .../DataHub/QueryType/Select.php | 1 + .../Resolver/MultiResourceResolver.php | 1 + .../DataHub/Resolver/ResourceResolver.php | 1 + .../DoctrineTargetEntitiesResolverPass.php | 1 + .../Compiler/PimcoreCachePass.php | 1 + .../Compiler/RegisterInstallersPass.php | 1 + .../RegisterPimcoreRepositoriesPass.php | 1 + .../Compiler/RegisterPimcoreResourcesPass.php | 1 + .../Compiler/RegisterResourcesPass.php | 1 + .../Compiler/StackClassesPass.php | 1 + .../Compiler/StackRepositoryPass.php | 1 + .../Compiler/ValidatorAutoMappingFixPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopResourceExtension.php | 1 + .../Driver/AbstractDriver.php | 1 + .../Doctrine/AbstractDoctrineDriver.php | 1 + .../Driver/Doctrine/DoctrineORMDriver.php | 1 + .../Driver/DriverInterface.php | 1 + .../Driver/DriverProvider.php | 1 + .../Exception/InvalidDriverException.php | 1 + .../Exception/UnknownDriverException.php | 1 + .../Driver/Pimcore/PimcoreDriver.php | 1 + .../Extension/AbstractModelExtension.php | 1 + .../Doctrine/ORM/EntityMerger.php | 1 + .../Doctrine/ORM/EntityRepository.php | 1 + .../Event/ResourceControllerEvent.php | 1 + .../AbstractDoctrineSubscriber.php | 1 + .../EventListener/BodyListener.php | 1 + .../EventListener/DeepCopySubscriber.php | 1 + .../ORMMappedSuperClassSubscriber.php | 1 + .../ORMRepositoryClassSubscriber.php | 1 + .../EventListener/ORMTranslatableListener.php | 1 + .../PimcoreAssetDataTransformer.php | 1 + .../PimcoreResourceDataTransformer.php | 1 + .../HttpFoundationRequestHandler.php | 1 + .../Form/Helper/ErrorSerializer.php | 1 + .../Form/Registry/FormTypeRegistry.php | 1 + .../Registry/FormTypeRegistryInterface.php | 1 + .../Form/Type/AbstractResourceType.php | 1 + .../Form/Type/FixedCollectionType.php | 1 + .../Form/Type/PimcoreAssetChoiceType.php | 1 + .../Form/Type/PimcoreClassChoiceType.php | 1 + .../Type/PimcoreResourceSelectionType.php | 1 + .../Form/Type/ResourceTranslationsType.php | 1 + .../Installer/CompositeResourceInstaller.php | 1 + .../Configuration/DocumentConfiguration.php | 1 + .../Configuration/GridConfigConfiguration.php | 1 + .../ImageThumbnailConfiguration.php | 1 + .../Configuration/RouteConfiguration.php | 1 + .../TranslationConfiguration.php | 1 + .../Installer/PimcoreClassInstaller.php | 1 + .../PimcoreClassInstallerInterface.php | 1 + .../PimcoreDependantBundleInstaller.php | 1 + .../Installer/PimcoreDocumentsInstaller.php | 1 + .../Installer/PimcoreGridConfigInstaller.php | 1 + .../PimcoreImageThumbnailsInstaller.php | 1 + .../Installer/PimcorePermissionInstaller.php | 1 + .../Installer/PimcoreRoutesInstaller.php | 1 + .../Installer/ResourceInstallerInterface.php | 1 + .../ResourceBundle/Installer/SqlInstaller.php | 1 + .../Pimcore/CacheMarshallerInterface.php | 1 + .../Pimcore/CacheResourceMarshaller.php | 1 + .../ResourceBundle/Pimcore/ObjectManager.php | 1 + .../Pimcore/PimcoreDaoRepository.php | 1 + .../Pimcore/PimcoreRepository.php | 1 + .../Pimcore/Repository/StackRepository.php | 1 + .../ResourceBundleInterface.php | 1 + .../ResourceBundle/Routing/Configuration.php | 1 + .../ResourceBundle/Routing/ResourceLoader.php | 1 + .../ResourceBundle/Routing/RouteFactory.php | 1 + .../Routing/RouteFactoryInterface.php | 1 + .../Serialization/CarbonHandler.php | 1 + .../Driver/PimcoreDataObjectDriver.php | 1 + .../Serialization/PimcoreAssetHandler.php | 1 + .../Serialization/PimcoreDocumentHandler.php | 1 + .../Serialization/PimcoreObjectHandler.php | 1 + .../Serialization/PimcoreSiteHandler.php | 1 + .../Serialization/RelationsHandler.php | 1 + .../VersionObjectConstructor.php | 1 + .../Validator/Constraints/Active.php | 1 + .../Validator/Constraints/ActiveValidator.php | 1 + .../Validator/Constraints/UniqueEntity.php | 1 + .../Constraints/UniqueEntityValidator.php | 1 + .../Assessor/RuleAvailabilityAssessor.php | 1 + .../RuleBundle/Collector/RuleCollector.php | 1 + .../RuleAvailabilityProcessorCommand.php | 1 + .../Bundle/RuleBundle/CoreShopRuleBundle.php | 1 + .../Compiler/RuleAvailabilityAssessorPass.php | 1 + .../TraceableValidationProcessorPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopRuleExtension.php | 1 + .../Doctrine/ORM/RuleRepository.php | 1 + .../Event/RuleAvailabilityCheckEvent.php | 1 + .../Form/DataMapper/ActionsFormMapper.php | 1 + .../Form/DataMapper/ConditionsFormMapper.php | 1 + .../AbstractConfigurableRuleElementType.php | 1 + .../AbstractConfigurationCollectionType.php | 1 + .../AbstractNestedConfigurationType.php | 1 + .../Type/Rule/EmptyConfigurationFormType.php | 1 + .../Form/Type/RuleActionChoiceType.php | 1 + .../Form/Type/RuleActionCollectionType.php | 1 + .../RuleBundle/Form/Type/RuleActionType.php | 1 + .../Form/Type/RuleConditionChoiceType.php | 1 + .../Form/Type/RuleConditionCollectionType.php | 1 + .../Form/Type/RuleConditionType.php | 1 + .../Bundle/RuleBundle/Form/Type/RuleType.php | 1 + .../Processor/RuleAvailabilityProcessor.php | 1 + .../RuleAvailabilityProcessorInterface.php | 1 + .../Bundle/SEOBundle/CoreShopSEOBundle.php | 1 + .../Compiler/ExtractorRegistryServicePass.php | 1 + .../CoreShopSEOExtension.php | 1 + .../SequenceBundle/CoreShopSequenceBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopSequenceExtension.php | 1 + .../Doctrine/ORM/SequenceRepository.php | 1 + .../Controller/CarrierController.php | 1 + .../Controller/ShippingRuleController.php | 1 + .../ShippingBundle/CoreExtension/Carrier.php | 1 + .../CoreExtension/CarrierMultiselect.php | 1 + .../ShippingBundle/CoreShopShippingBundle.php | 1 + .../CompositeShippableValidatorPass.php | 1 + .../Compiler/ShippingPriceCalculatorsPass.php | 1 + .../Compiler/ShippingRuleActionPass.php | 1 + .../Compiler/ShippingRuleConditionPass.php | 1 + .../ShippingTaxCalculationStrategyPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopShippingExtension.php | 1 + .../Form/Type/CarrierChoiceType.php | 1 + .../Form/Type/CarrierTranslationType.php | 1 + .../ShippingBundle/Form/Type/CarrierType.php | 1 + ...AdditionPercentActionConfigurationType.php | 1 + ...DiscountPercentActionConfigurationType.php | 1 + .../Common/ShippingRuleConfigurationType.php | 1 + .../Condition/AmountConfigurationType.php | 1 + .../Condition/DimensionConfigurationType.php | 1 + .../Condition/NestedConfigurationType.php | 1 + .../Condition/PostcodeConfigurationType.php | 1 + .../Condition/WeightConfigurationType.php | 1 + .../Type/ShippingRuleActionChoiceType.php | 1 + .../Type/ShippingRuleActionCollectionType.php | 1 + .../Form/Type/ShippingRuleActionType.php | 1 + .../Form/Type/ShippingRuleChoiceType.php | 1 + .../Type/ShippingRuleConditionChoiceType.php | 1 + .../ShippingRuleConditionCollectionType.php | 1 + .../Form/Type/ShippingRuleConditionType.php | 1 + .../Type/ShippingRuleGroupCollectionType.php | 1 + .../Form/Type/ShippingRuleGroupType.php | 1 + .../Form/Type/ShippingRuleType.php | 1 + ...ippingTaxCalculationStrategyChoiceType.php | 1 + .../Controller/StorageListController.php | 1 + .../SessionStoreStorageListSubscriber.php | 1 + .../StorageListBlamerListener.php | 1 + .../CoreShopStorageListBundle.php | 1 + .../Compiler/RegisterStorageListPass.php | 1 + .../RegisterStorageListProcessorPass.php | 1 + .../CoreShopStorageListExtension.php | 1 + .../EventListener/SessionSubscriber.php | 1 + .../Form/Type/AddToStorageListType.php | 1 + .../Form/Type/StorageListItemType.php | 1 + .../Form/Type/StorageListType.php | 1 + .../PimcoreStorageListRepository.php | 1 + .../StoreBundle/Collector/StoreCollector.php | 1 + .../Context/Debug/DebugStoreContext.php | 1 + .../Context/Debug/DebugStorePersister.php | 1 + .../Context/Debug/DebugStoreProvider.php | 1 + .../Debug/DebugStoreProviderInterface.php | 1 + .../Controller/StoreController.php | 1 + .../StoreBundle/CoreExtension/Store.php | 1 + .../CoreExtension/StoreMultiselect.php | 1 + .../StoreBundle/CoreShopStoreBundle.php | 1 + .../Compiler/CompositeRequestResolverPass.php | 1 + .../Compiler/CompositeStoreContextPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopStoreExtension.php | 1 + .../Doctrine/ORM/StoreRepository.php | 1 + .../StoreBundle/Form/Type/StoreChoiceType.php | 1 + .../StoreBundle/Form/Type/StoreType.php | 1 + .../StoreBundle/Helper/PimcoreSiteHelper.php | 1 + .../Helper/PimcoreSiteHelperInterface.php | 1 + .../StoreBundle/Theme/StoreThemeResolver.php | 1 + .../Controller/TaxRuleGroupController.php | 1 + .../TaxationBundle/CoreExtension/TaxRate.php | 1 + .../CoreExtension/TaxRuleGroup.php | 1 + .../TaxationBundle/CoreShopTaxationBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopTaxationExtension.php | 1 + .../Doctrine/ORM/TaxRateRepository.php | 1 + .../Doctrine/ORM/TaxRuleRepository.php | 1 + .../Form/Type/TaxRateChoiceType.php | 1 + .../Form/Type/TaxRateTranslationType.php | 1 + .../TaxationBundle/Form/Type/TaxRateType.php | 1 + .../Form/Type/TaxRuleGroupChoiceType.php | 1 + .../Form/Type/TaxRuleGroupType.php | 1 + .../TaxationBundle/Form/Type/TaxRuleType.php | 1 + .../Bundle/TestBundle/CoreShopTestBundle.php | 1 + .../CoreShopTestExtension.php | 1 + .../ThemeBundle/Context/ThemeContext.php | 1 + .../ThemeBundle/CoreShopThemeBundle.php | 1 + .../Compiler/CompositeThemeResolverPass.php | 1 + .../RemoveThemeAwareTranslatorPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopThemeExtension.php | 1 + .../EventListener/DocumentRenderListener.php | 1 + .../Service/CompositeThemeResolver.php | 1 + .../DocumentThemeResolverInterface.php | 1 + .../PimcoreDocumentPropertyResolver.php | 1 + .../Service/PimcoreSiteThemeResolver.php | 1 + .../ThemeBundle/Service/ThemeHelper.php | 1 + .../Service/ThemeHelperInterface.php | 1 + .../Service/ThemeNotResolvedException.php | 1 + .../Service/ThemeResolverInterface.php | 1 + .../TrackingBundle/CoreShopTrackingBundle.php | 1 + .../Compiler/TrackerPass.php | 1 + .../Compiler/TrackingExtractorPass.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopTrackingExtension.php | 1 + .../GtmDataLayerBlockListener.php | 1 + .../Resolver/ConfigResolver.php | 1 + .../Resolver/ConfigResolverInterface.php | 1 + .../Tracker/AbstractEcommerceTracker.php | 1 + .../Google/AnalyticsEnhancedEcommerce.php | 1 + .../Google/GlobalSiteTagEnhancedEcommerce.php | 1 + .../Tracker/Google/TagManager/CodeTracker.php | 1 + .../TagManager/TagManagerClassicEcommerce.php | 1 + .../TagManagerEnhancedEcommerce.php | 1 + .../Tracker/Google/UniversalEcommerce.php | 1 + .../Bundle/UserBundle/CoreShopUserBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopUserExtension.php | 1 + .../Event/RequestPasswordChangeEvent.php | 1 + .../Form/Type/ChangePasswordType.php | 1 + .../Form/Type/RequestResetPasswordType.php | 1 + .../Form/Type/ResetPasswordType.php | 1 + .../UserBundle/Form/Type/UserLoginType.php | 1 + .../Pimcore/Repository/UserRepository.php | 1 + .../VariantBundle/CoreShopVariantBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopVariantExtension.php | 1 + .../EventListener/AttributeListener.php | 1 + .../EventListener/MainVariantListener.php | 1 + .../EventListener/ProductListener.php | 1 + .../Pimcore/VariantLinkGenerator.php | 1 + .../Twig/Extension/VariantExtension.php | 1 + .../Validator/Constraints/ValidAttributes.php | 1 + .../Constraints/ValidAttributesType.php | 1 + .../ValidAttributesTypeValidator.php | 1 + .../Constraints/ValidAttributesValidator.php | 15 ++++++ .../WishlistBundle/CoreShopWishlistBundle.php | 1 + .../CoreShopWishlistExtension.php | 1 + .../Form/Type/AddToWishlistType.php | 1 + .../Form/Type/WishlistItemType.php | 1 + .../WishlistBundle/Form/Type/WishlistType.php | 1 + .../Repository/WishlistItemRepository.php | 1 + .../Pimcore/Repository/WishlistRepository.php | 1 + .../Applier/StateMachineApplier.php | 1 + .../Applier/StateMachineApplierInterface.php | 1 + .../Callback/CascadeTransition.php | 1 + .../WorkflowBundle/CoreShopWorkflowBundle.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../CoreShopWorkflowExtension.php | 1 + .../Event/WorkflowTransitionEvent.php | 1 + .../EventListener/WorkflowListener.php | 1 + .../WorkflowBundle/History/HistoryLogger.php | 1 + .../History/HistoryLoggerInterface.php | 1 + .../History/HistoryRepository.php | 1 + .../History/HistoryRepositoryInterface.php | 1 + .../History/StateHistoryLogger.php | 1 + .../History/StateHistoryLoggerInterface.php | 1 + .../Manager/StateMachineManager.php | 1 + .../Manager/StateMachineManagerInterface.php | 1 + .../OrmPersistentMarkingStore.php | 1 + .../PimcorePersistentMarkingStore.php | 1 + src/CoreShop/Bundle/WorkflowBundle/Notes.php | 1 + .../StateManager/WorkflowStateInfoManager.php | 1 + .../WorkflowStateInfoManagerInterface.php | 1 + .../Context/CompositeCountryContext.php | 1 + .../Context/CountryContextInterface.php | 1 + .../Context/CountryNotFoundException.php | 1 + .../Address/Context/FixedCountryContext.php | 1 + .../RequestBased/CachedCountryContext.php | 1 + .../RequestBased/CompositeRequestResolver.php | 1 + .../Context/RequestBased/CountryContext.php | 1 + .../GeoLiteBasedRequestResolver.php | 1 + .../RequestBased/RequestResolverInterface.php | 1 + .../Address/Formatter/AddressFormatter.php | 1 + .../Formatter/AddressFormatterInterface.php | 1 + .../Component/Address/Model/Address.php | 1 + .../Address/Model/AddressIdentifier.php | 1 + .../Model/AddressIdentifierInterface.php | 1 + .../Address/Model/AddressInterface.php | 1 + .../Address/Model/AddressesAwareInterface.php | 1 + .../Address/Model/AddressesAwareTrait.php | 1 + .../Address/Model/CountriesAwareInterface.php | 1 + .../Address/Model/CountriesAwareTrait.php | 1 + .../Component/Address/Model/Country.php | 1 + .../Address/Model/CountryInterface.php | 1 + .../Address/Model/CountryTranslation.php | 1 + .../Model/CountryTranslationInterface.php | 1 + .../Model/DefaultAddressAwareInterface.php | 1 + .../Component/Address/Model/State.php | 1 + .../Address/Model/StateInterface.php | 1 + .../Address/Model/StateTranslation.php | 1 + .../Model/StateTranslationInterface.php | 1 + src/CoreShop/Component/Address/Model/Zone.php | 1 + .../Component/Address/Model/ZoneInterface.php | 1 + .../AddressIdentifierRepositoryInterface.php | 1 + .../Repository/CountryRepositoryInterface.php | 1 + .../Configuration/Model/Configuration.php | 1 + .../Model/ConfigurationInterface.php | 1 + .../ConfigurationRepositoryInterface.php | 1 + .../Service/ConfigurationService.php | 1 + .../Service/ConfigurationServiceInterface.php | 1 + .../Core/Cart/CartContextResolver.php | 1 + .../Action/DiscountAmountActionProcessor.php | 1 + .../Action/DiscountPercentActionProcessor.php | 1 + .../Action/FreeShippingActionProcessor.php | 1 + .../Action/GiftProductActionProcessor.php | 1 + .../Action/SurchargeAmountActionProcessor.php | 1 + .../SurchargePercentActionProcessor.php | 1 + .../Action/VoucherCreditActionProcessor.php | 1 + .../Cart/Rule/Applier/CartRuleApplier.php | 1 + .../Rule/Applier/CartRuleApplierInterface.php | 1 + .../Condition/CarriersConditionChecker.php | 1 + .../Condition/CategoriesConditionChecker.php | 1 + .../Condition/CountriesConditionChecker.php | 1 + .../Condition/CurrenciesConditionChecker.php | 1 + .../CustomerGroupsConditionChecker.php | 1 + .../Condition/CustomersConditionChecker.php | 1 + .../Condition/ProductsConditionChecker.php | 1 + .../Rule/Condition/StoresConditionChecker.php | 1 + .../Rule/Condition/ZonesConditionChecker.php | 1 + .../Action/DiscountAmountActionProcessor.php | 1 + .../Action/DiscountPercentActionProcessor.php | 1 + .../Rule/Applier/CartItemRuleApplier.php | 1 + .../Applier/CartItemRuleApplierInterface.php | 1 + .../Condition/CategoriesConditionChecker.php | 1 + .../Condition/ProductsConditionChecker.php | 1 + .../Configuration/ConfigurationService.php | 1 + .../ConfigurationServiceInterface.php | 1 + .../Country/StoreAwareCountryContext.php | 1 + .../Currency/CountryAwareCurrencyContext.php | 1 + .../Currency/StorageBasedCurrencyContext.php | 1 + .../Currency/StoreAwareCurrencyContext.php | 1 + .../Component/Core/Context/ShopperContext.php | 1 + .../Core/Context/ShopperContextInterface.php | 1 + .../Core/Context/StoreBasedCartContext.php | 1 + .../Core/Currency/CurrencyStorage.php | 1 + .../Currency/CurrencyStorageInterface.php | 1 + .../Address/AddressAccessOptionsProvider.php | 1 + .../Address/AddressAssignmentManager.php | 1 + .../AddressAssignmentManagerInterface.php | 1 + .../Allocator/CustomerAddressAllocator.php | 1 + .../CustomerAddressAllocatorInterface.php | 1 + .../Core/Customer/CustomerTransformHelper.php | 1 + .../CustomerTransformHelperInterface.php | 1 + src/CoreShop/Component/Core/Events.php | 1 + .../Extensions/ProductClassExtension.php | 1 + .../Operator/OrderInventoryOperator.php | 1 + .../OrderInventoryOperatorInterface.php | 1 + .../Context/PimcoreAdminLocaleContext.php | 1 + src/CoreShop/Component/Core/Model/Carrier.php | 1 + .../Component/Core/Model/CarrierInterface.php | 1 + .../Component/Core/Model/Category.php | 1 + .../Core/Model/CategoryInterface.php | 1 + src/CoreShop/Component/Core/Model/Company.php | 1 + .../Component/Core/Model/CompanyInterface.php | 1 + .../Component/Core/Model/Configuration.php | 1 + .../Core/Model/ConfigurationInterface.php | 1 + src/CoreShop/Component/Core/Model/Country.php | 1 + .../Component/Core/Model/CountryInterface.php | 1 + .../Component/Core/Model/Currency.php | 1 + .../Core/Model/CurrencyInterface.php | 1 + .../Component/Core/Model/Customer.php | 1 + .../Core/Model/CustomerInterface.php | 1 + src/CoreShop/Component/Core/Model/Order.php | 1 + .../Component/Core/Model/OrderInterface.php | 1 + .../Component/Core/Model/OrderItem.php | 1 + .../Core/Model/OrderItemInterface.php | 1 + .../Component/Core/Model/OrderShipment.php | 1 + .../Core/Model/OrderShipmentInterface.php | 1 + .../Core/Model/OrderShipmentItem.php | 1 + .../Core/Model/OrderShipmentItemInterface.php | 1 + src/CoreShop/Component/Core/Model/Payment.php | 1 + .../Component/Core/Model/PaymentInterface.php | 1 + .../Component/Core/Model/PaymentProvider.php | 1 + .../Core/Model/PaymentProviderInterface.php | 1 + .../Model/PimcoreStoresAwareInterface.php | 1 + src/CoreShop/Component/Core/Model/Product.php | 1 + .../Component/Core/Model/ProductInterface.php | 1 + .../Core/Model/ProductQuantityPriceRule.php | 1 + .../ProductQuantityPriceRuleInterface.php | 1 + .../Core/Model/ProductStoreValues.php | 1 + .../Model/ProductStoreValuesInterface.php | 1 + .../Core/Model/ProductUnitDefinitionPrice.php | 1 + .../ProductUnitDefinitionPriceInterface.php | 1 + .../Component/Core/Model/QuantityRange.php | 1 + .../Core/Model/QuantityRangeInterface.php | 1 + src/CoreShop/Component/Core/Model/Store.php | 1 + .../Component/Core/Model/StoreInterface.php | 1 + src/CoreShop/Component/Core/Model/TaxRule.php | 1 + .../Component/Core/Model/TaxRuleInterface.php | 1 + src/CoreShop/Component/Core/Model/User.php | 1 + .../Component/Core/Model/UserInterface.php | 1 + .../Component/Core/Model/Wishlist.php | 1 + .../Core/Model/WishlistInterface.php | 1 + .../Action/Order/OrderMailActionProcessor.php | 1 + .../Action/Order/StoreMailActionProcessor.php | 1 + .../Order/StoreOrderMailActionProcessor.php | 1 + .../Condition/Order/BackendCreatedChecker.php | 1 + .../Rule/Condition/Order/CarriersChecker.php | 1 + .../Rule/Condition/Order/CommentChecker.php | 1 + .../Rule/Condition/SimpleStateChecker.php | 1 + .../Rule/Condition/StateTransitionChecker.php | 1 + .../Rule/Condition/StoresChecker.php | 1 + .../Rule/Condition/User/UserTypeChecker.php | 1 + .../PurchasableProductDiscountCalculator.php | 1 + ...chasableProductDiscountPriceCalculator.php | 1 + .../PurchasableProductPriceCalculator.php | 1 + ...urchasableProductRetailPriceCalculator.php | 1 + .../Core/Order/Committer/OrderCommitter.php | 1 + .../Core/Order/Committer/QuoteCommitter.php | 1 + .../Modifier/CartItemQuantityModifier.php | 1 + .../NumberGenerator/SaleNumberGenerator.php | 1 + .../Order/OrderMailProcessorInterface.php | 1 + .../Order/Processor/CartAdjustmentClearer.php | 1 + .../CartCurrencyConversionProcessor.php | 1 + .../Order/Processor/CartItemProcessor.php | 1 + .../Order/Processor/CartItemsProcessor.php | 1 + .../Processor/CartItemsWholesaleProcessor.php | 1 + .../Order/Processor/CartPaymentProcessor.php | 1 + .../CartPriceRuleVoucherProcessor.php | 1 + .../Order/Processor/CartRuleAutoProcessor.php | 1 + .../Order/Processor/CartShippingProcessor.php | 1 + .../Core/Order/Processor/CartTaxProcessor.php | 1 + .../Order/Processor/CartTextProcessor.php | 1 + .../OrderItemToShipmentItemTransformer.php | 1 + .../OrderToShipmentTransformer.php | 1 + .../StoreBasedPaymentProviderResolver.php | 1 + .../Core/Portlet/ExportPortletInterface.php | 1 + .../Core/Portlet/PortletInterface.php | 1 + .../StoreProductPriceCalculator.php | 15 ++++++ ...reProductUnitDefinitionPriceCalculator.php | 1 + .../Product/Cloner/ProductClonerInterface.php | 1 + .../Product/ProductTaxCalculatorFactory.php | 1 + .../ProductTaxCalculatorFactoryInterface.php | 1 + .../Condition/CategoriesConditionChecker.php | 1 + .../Condition/CountriesConditionChecker.php | 1 + .../Condition/CurrenciesConditionChecker.php | 1 + .../CustomerGroupsConditionChecker.php | 1 + .../Condition/CustomersConditionChecker.php | 1 + .../Condition/ProductsConditionChecker.php | 1 + .../Condition/QuantityConditionChecker.php | 1 + .../Rule/Condition/StoresConditionChecker.php | 1 + .../Rule/Condition/ZonesConditionChecker.php | 1 + .../Product/TaxedProductPriceCalculator.php | 1 + .../TaxedProductPriceCalculatorInterface.php | 1 + .../Calculator/UnitVolumeCalculator.php | 1 + .../Rule/Action/AmountDecreaseAction.php | 1 + .../Rule/Action/AmountIncreaseAction.php | 1 + .../Rule/Action/FixedAction.php | 1 + .../Provider/AddressProviderInterface.php | 1 + .../ContextBasedDefaultTaxAddressProvider.php | 1 + .../DefaultTaxAddressProviderInterface.php | 1 + .../Provider/StoreBasedAddressProvider.php | 1 + .../Core/Report/ExportReportInterface.php | 1 + .../Component/Core/Report/ReportInterface.php | 1 + .../Repository/CarrierRepositoryInterface.php | 1 + .../CategoryRepositoryInterface.php | 1 + .../ConfigurationRepositoryInterface.php | 1 + .../Repository/CountryRepositoryInterface.php | 1 + .../CurrencyRepositoryInterface.php | 1 + .../CustomerRepositoryInterface.php | 1 + .../PaymentProviderRepositoryInterface.php | 1 + .../Repository/ProductRepositoryInterface.php | 1 + .../ProductStoreValuesRepositoryInterface.php | 1 + .../ProductVariantRepositoryInterface.php | 1 + .../Repository/TaxRuleRepositoryInterface.php | 1 + .../CategoriesConditionCheckerTrait.php | 1 + .../Condition/ProductVariantsCheckerTrait.php | 1 + .../TaxedCarrierPriceRuleCalculator.php | 1 + .../StoreBasedShippableCarriersDiscovery.php | 1 + .../CheapestDefaultCarrierResolver.php | 1 + .../Action/AdditionAmountActionProcessor.php | 1 + .../Action/DiscountAmountActionProcessor.php | 1 + .../Rule/Action/PriceActionProcessor.php | 1 + .../Condition/CategoriesConditionChecker.php | 1 + .../Condition/CountriesConditionChecker.php | 1 + .../Condition/CurrenciesConditionChecker.php | 1 + .../CustomerGroupsConditionChecker.php | 1 + .../Condition/CustomersConditionChecker.php | 1 + .../Condition/ProductsConditionChecker.php | 1 + .../Rule/Condition/StoresConditionChecker.php | 1 + .../Rule/Condition/ZonesConditionChecker.php | 1 + .../TaxCalculationStrategyCartItems.php | 1 + .../TaxCalculationStrategyTaxRule.php | 1 + .../Taxation/CachedTaxCalculatorFactory.php | 1 + .../DefaultTaxationDisplayProvider.php | 1 + .../Component/Core/Taxation/TaxApplicator.php | 1 + .../Core/Taxation/TaxApplicatorInterface.php | 1 + .../Core/Taxation/TaxCalculatorFactory.php | 1 + .../TaxCalculatorFactoryInterface.php | 1 + .../TaxationDisplayProviderInterface.php | 1 + .../Tracking/Extractor/OrderExtractor.php | 1 + .../Tracking/Extractor/OrderItemExtractor.php | 1 + .../Tracking/Extractor/ProductExtractor.php | 1 + ...ranslatableEntityPimcoreLocaleAssigner.php | 1 + .../WishlistRepositoryInterface.php | 1 + .../Context/CachedCurrencyContext.php | 1 + .../Context/CompositeCurrencyContext.php | 1 + .../Context/CurrencyContextInterface.php | 1 + .../Context/CurrencyNotFoundException.php | 1 + .../Currency/Context/FixedCurrencyContext.php | 1 + .../Currency/Converter/CurrencyConverter.php | 1 + .../Converter/CurrencyConverterInterface.php | 1 + .../DefaultDisplayFractionProvider.php | 1 + .../DisplayFractionProviderInterface.php | 1 + .../Formatter/MoneyFormatterInterface.php | 1 + .../Component/Currency/Model/Currency.php | 1 + .../Currency/Model/CurrencyAwareInterface.php | 1 + .../Currency/Model/CurrencyAwareTrait.php | 1 + .../Currency/Model/CurrencyInterface.php | 1 + .../Component/Currency/Model/ExchangeRate.php | 1 + .../Currency/Model/ExchangeRateInterface.php | 1 + .../Component/Currency/Model/Money.php | 1 + .../CurrencyRepositoryInterface.php | 1 + .../ExchangeRateRepositoryInterface.php | 1 + .../Context/CompositeCustomerContext.php | 1 + .../Context/CustomerContextInterface.php | 1 + .../Context/CustomerNotFoundException.php | 1 + .../Customer/Context/FixedCustomerContext.php | 1 + .../RequestBased/CompositeRequestResolver.php | 1 + .../Context/RequestBased/CustomerContext.php | 1 + .../RequestBased/RequestResolverInterface.php | 1 + .../Component/Customer/Model/Company.php | 1 + .../Customer/Model/CompanyInterface.php | 1 + .../Component/Customer/Model/Customer.php | 1 + .../Customer/Model/CustomerAwareInterface.php | 1 + .../Customer/Model/CustomerGroup.php | 1 + .../Customer/Model/CustomerGroupInterface.php | 1 + .../Customer/Model/CustomerInterface.php | 1 + .../Repository/CompanyRepositoryInterface.php | 1 + .../CustomerRepositoryInterface.php | 1 + .../Index/Condition/CompareCondition.php | 1 + .../Index/Condition/ConcatCondition.php | 1 + .../Index/Condition/ConditionInterface.php | 1 + .../Index/Condition/ConditionRenderer.php | 1 + .../Condition/ConditionRendererInterface.php | 1 + .../Condition/DynamicRendererInterface.php | 1 + .../Index/Condition/GreaterThanCondition.php | 1 + .../Condition/GreaterThanEqualCondition.php | 1 + .../Component/Index/Condition/InCondition.php | 1 + .../Component/Index/Condition/IsCondition.php | 1 + .../Index/Condition/IsNotNullCondition.php | 1 + .../Index/Condition/IsNullCondition.php | 1 + .../Index/Condition/LikeCondition.php | 1 + .../Index/Condition/LowerThanCondition.php | 1 + .../Condition/LowerThanEqualCondition.php | 1 + .../Index/Condition/MatchCondition.php | 1 + .../Index/Condition/NotInCondition.php | 1 + .../Index/Condition/NotLikeCondition.php | 1 + .../Index/Condition/NotMatchCondition.php | 1 + .../Index/Condition/RangeCondition.php | 1 + .../DecimalIndexColumnTypeConfigExtension.php | 1 + .../IndexColumnTypeConfigExtension.php | 1 + .../IndexColumnsExtensionInterface.php | 1 + .../Extension/IndexExtensionInterface.php | 1 + ...dexRelationalColumnsExtensionInterface.php | 1 + .../IndexSystemColumnTypeConfigExtension.php | 1 + .../FilteredListingFactoryInterface.php | 1 + .../Index/Factory/ListingFactoryInterface.php | 1 + .../BooleanFilterConditionProcessor.php | 1 + .../CategoryMultiSelectConditionProcessor.php | 1 + .../CategorySelectConditionProcessor.php | 1 + .../FilterConditionProcessorInterface.php | 1 + .../FilterPreConditionProcessorInterface.php | 1 + .../Index/Filter/FilterProcessor.php | 1 + .../Index/Filter/FilterProcessorInterface.php | 1 + .../FilterUserConditionProcessorInterface.php | 1 + ...ilterConditionFromMultiselectProcessor.php | 1 + .../MultiselectFilterConditionProcessor.php | 1 + .../Filter/NestedFilterConditionProcessor.php | 1 + .../Filter/RangeFilterConditionProcessor.php | 1 + ...elationalMultiselectConditionProcessor.php | 1 + .../RelationalSelectConditionProcessor.php | 1 + .../Index/Filter/SearchConditionProcessor.php | 1 + ...ilterConditionFromMultiselectProcessor.php | 1 + .../Filter/SelectFilterConditionProcessor.php | 1 + .../Component/Index/Getter/BrickGetter.php | 1 + .../Getter/ClassificationStoreGetter.php | 1 + .../Index/Getter/FieldCollectionGetter.php | 1 + .../Index/Getter/GetterInterface.php | 1 + .../Index/Getter/LocalizedFieldGetter.php | 1 + .../Interpreter/ExpressionInterpreter.php | 1 + .../Interpreter/InterpreterInterface.php | 1 + .../Index/Interpreter/IteratorInterpreter.php | 1 + .../Interpreter/LocaleMappingInterpreter.php | 1 + .../LocalizedInterpreterInterface.php | 1 + .../LocalizedNestedInterpreter.php | 1 + .../Index/Interpreter/NestedInterpreter.php | 1 + .../Index/Interpreter/NestedTrait.php | 1 + .../Index/Interpreter/ObjectIdInterpreter.php | 1 + .../Interpreter/ObjectIdSumInterpreter.php | 1 + .../Index/Interpreter/ObjectInterpreter.php | 1 + .../Interpreter/ObjectPropertyInterpreter.php | 1 + .../Interpreter/QuantityValueInterpreter.php | 1 + .../RelationInterpreterInterface.php | 1 + .../RelationalNestedInterpreter.php | 1 + .../Index/Interpreter/RelationalValue.php | 1 + .../Interpreter/RelationalValueInterface.php | 1 + .../Index/Interpreter/SoundexInterpreter.php | 1 + .../Interpreter/TimestampInterpreter.php | 1 + .../Listing/ExtendedListingInterface.php | 1 + .../Index/Listing/ListingInterface.php | 1 + .../Listing/OrderAwareListingInterface.php | 1 + src/CoreShop/Component/Index/Model/Filter.php | 1 + .../Component/Index/Model/FilterCondition.php | 1 + .../Index/Model/FilterConditionInterface.php | 1 + .../Component/Index/Model/FilterInterface.php | 1 + src/CoreShop/Component/Index/Model/Index.php | 1 + .../Component/Index/Model/IndexColumn.php | 1 + .../Index/Model/IndexColumnInterface.php | 1 + .../Component/Index/Model/IndexInterface.php | 1 + .../Index/Model/IndexableInterface.php | 1 + .../Order/DynamicOrderRendererInterface.php | 1 + .../Component/Index/Order/OrderInterface.php | 1 + .../Component/Index/Order/OrderRenderer.php | 1 + .../Index/Order/OrderRendererInterface.php | 1 + .../Component/Index/Order/SimpleOrder.php | 1 + .../Index/Service/IndexUpdaterService.php | 1 + .../Service/IndexUpdaterServiceInterface.php | 1 + .../Index/Worker/FilterGroupHelper.php | 1 + .../Worker/FilterGroupHelperInterface.php | 1 + .../Index/Worker/WorkerInterface.php | 1 + .../Inventory/Checker/AvailabilityChecker.php | 1 + .../Checker/AvailabilityCheckerInterface.php | 1 + .../Inventory/Model/StockableInterface.php | 1 + .../Locale/Context/CompositeLocaleContext.php | 1 + .../Locale/Context/FixedLocaleContext.php | 1 + .../Locale/Context/LocaleContextInterface.php | 1 + .../Context/LocaleNotFoundException.php | 1 + .../Locale/Context/PimcoreLocaleContext.php | 1 + .../Locale/Model/LocaleAwareInterface.php | 1 + .../Notification/Model/NotificationRule.php | 1 + .../Model/NotificationRuleInterface.php | 1 + .../Notification/Processor/RuleApplier.php | 1 + .../Processor/RuleApplierInterface.php | 1 + .../Notification/Processor/RulesProcessor.php | 1 + .../Processor/RulesProcessorInterface.php | 1 + .../NotificationRuleRepositoryInterface.php | 1 + .../Rule/Action/MailActionProcessor.php | 1 + .../NotificationRuleProcessorInterface.php | 1 + .../Condition/AbstractConditionChecker.php | 1 + .../NotificationConditionCheckerInterface.php | 1 + ...CompositePurchasableDiscountCalculator.php | 1 + ...sitePurchasableDiscountPriceCalculator.php | 1 + .../CompositePurchasablePriceCalculator.php | 1 + ...positePurchasableRetailPriceCalculator.php | 1 + ...itePurchasableWholesalePriceCalculator.php | 1 + .../NoDiscountPurchasableCalculator.php | 1 + .../Calculator/PurchasableCalculator.php | 1 + .../PurchasableCalculatorInterface.php | 1 + ...PurchasableDiscountCalculatorInterface.php | 1 + ...asableDiscountPriceCalculatorInterface.php | 1 + .../Calculator/PurchasablePriceCalculator.php | 1 + .../PurchasablePriceCalculatorInterface.php | 1 + ...chasableRetailPriceCalculatorInterface.php | 1 + .../PurchasableWholesalePriceCalculator.php | 1 + ...sableWholesalePriceCalculatorInterface.php | 1 + .../Order/Cart/CartContextResolver.php | 1 + .../Cart/CartContextResolverInterface.php | 1 + .../Component/Order/Cart/CartItemResolver.php | 1 + .../Component/Order/Cart/CartModifier.php | 1 + .../Order/Cart/CartModifierInterface.php | 1 + .../Rule/Action/CartItemActionProcessor.php | 1 + .../CartPriceRuleActionProcessorInterface.php | 1 + .../Cart/Rule/CartPriceRuleProcessor.php | 1 + .../Rule/CartPriceRuleProcessorInterface.php | 1 + .../Cart/Rule/CartPriceRuleUnProcessor.php | 1 + .../CartPriceRuleUnProcessorInterface.php | 1 + .../Rule/CartPriceRuleValidationProcessor.php | 1 + ...tPriceRuleValidationProcessorInterface.php | 1 + .../Condition/AbstractConditionChecker.php | 1 + .../Rule/Condition/AmountConditionChecker.php | 1 + .../CartRuleConditionCheckerInterface.php | 1 + .../Condition/TimeSpanConditionChecker.php | 1 + .../Condition/VoucherConditionChecker.php | 1 + .../Rule/ProposalCartPriceRuleCalculator.php | 1 + ...oposalCartPriceRuleCalculatorInterface.php | 1 + src/CoreShop/Component/Order/CartEvents.php | 1 + ...tItemPriceRuleActionProcessorInterface.php | 1 + .../Condition/AbstractConditionChecker.php | 1 + .../Rule/Condition/AmountConditionChecker.php | 1 + ...derItemActionConditionCheckerInterface.php | 1 + .../Order/Checkout/CheckoutException.php | 1 + .../Order/Checkout/CheckoutManager.php | 1 + .../CheckoutManagerFactoryInterface.php | 1 + .../Checkout/CheckoutManagerInterface.php | 1 + .../Order/Checkout/CheckoutStepInterface.php | 1 + .../DefaultCheckoutManagerFactory.php | 1 + .../OptionalCheckoutStepInterface.php | 1 + .../RedirectCheckoutStepInterface.php | 1 + .../ValidationCheckoutStepInterface.php | 1 + .../Component/Order/CheckoutEvents.php | 1 + .../Committer/OrderCommitterInterface.php | 1 + .../Committer/QuoteCommitterInterface.php | 1 + .../Component/Order/Context/CartContext.php | 1 + .../Order/Context/CartContextInterface.php | 1 + .../Order/Context/CartNotFoundException.php | 1 + .../Order/Context/CompositeCartContext.php | 1 + .../Order/Context/FixedCartContext.php | 1 + .../Order/Distributor/FloatDistributor.php | 1 + .../Distributor/FloatDistributorInterface.php | 1 + .../Order/Distributor/IntegerDistributor.php | 1 + .../IntegerDistributorInterface.php | 1 + .../ProportionalIntegerDistributor.php | 1 + ...roportionalIntegerDistributorInterface.php | 1 + .../Component/Order/Event/CheckoutEvent.php | 1 + .../FailedCodeGenerationException.php | 1 + ...PurchasableDiscountPriceFoundException.php | 1 + .../NoPurchasablePriceFoundException.php | 1 + ...NoPurchasableRetailPriceFoundException.php | 1 + ...urchasableWholesalePriceFoundException.php | 1 + .../Order/Factory/AdjustmentFactory.php | 1 + .../Factory/AdjustmentFactoryInterface.php | 1 + .../Component/Order/Factory/OrderFactory.php | 1 + .../Order/Factory/OrderItemFactory.php | 1 + .../Factory/OrderItemFactoryInterface.php | 1 + .../CartPriceRuleVoucherCodeGenerator.php | 1 + .../Order/Generator/CodeGeneratorChecker.php | 1 + .../CodeGeneratorCheckerInterface.php | 1 + .../Generator/CodeGeneratorLetterResolver.php | 1 + .../Component/Order/InvoiceStates.php | 1 + .../Component/Order/InvoiceTransitions.php | 1 + .../Order/Manager/CartManagerInterface.php | 1 + .../Order/Model/AdjustableInterface.php | 1 + .../Component/Order/Model/AdjustableTrait.php | 17 ++++++- .../Component/Order/Model/Adjustment.php | 1 + .../Order/Model/AdjustmentInterface.php | 1 + .../Component/Order/Model/CartPriceRule.php | 1 + .../Order/Model/CartPriceRuleInterface.php | 1 + .../Order/Model/CartPriceRuleTranslation.php | 1 + .../CartPriceRuleTranslationInterface.php | 1 + .../Order/Model/CartPriceRuleVoucherCode.php | 1 + .../CartPriceRuleVoucherCodeInterface.php | 1 + .../Model/CartPriceRuleVoucherGenerator.php | 1 + ...CartPriceRuleVoucherGeneratorInterface.php | 1 + .../Model/ConvertedAdjustableInterface.php | 1 + .../Order/Model/ConvertedAdjustableTrait.php | 17 ++++++- src/CoreShop/Component/Order/Model/Order.php | 1 + .../Order/Model/OrderDocumentInterface.php | 1 + .../Model/OrderDocumentItemInterface.php | 1 + .../Component/Order/Model/OrderInterface.php | 19 +++++++- .../Component/Order/Model/OrderInvoice.php | 1 + .../Order/Model/OrderInvoiceInterface.php | 1 + .../Order/Model/OrderInvoiceItem.php | 1 + .../Order/Model/OrderInvoiceItemInterface.php | 1 + .../Component/Order/Model/OrderItem.php | 1 + .../Order/Model/OrderItemInterface.php | 19 +++++++- .../Order/Model/OrderPaymentInterface.php | 1 + .../Component/Order/Model/OrderShipment.php | 1 + .../Order/Model/OrderShipmentInterface.php | 1 + .../Order/Model/OrderShipmentItem.php | 1 + .../Model/OrderShipmentItemInterface.php | 1 + .../Component/Order/Model/PriceRuleItem.php | 1 + .../Order/Model/PriceRuleItemInterface.php | 15 ++++++ .../Order/Model/ProposalCartPriceRuleItem.php | 1 + .../ProposalCartPriceRuleItemInterface.php | 1 + .../Order/Model/ProposalPriceRuleTrait.php | 27 ++++++++--- .../Order/Model/PurchasableInterface.php | 1 + .../Order/Modifier/VoucherModifier.php | 1 + .../Modifier/VoucherModifierInterface.php | 1 + src/CoreShop/Component/Order/Notes.php | 1 + .../NumberGeneratorInterface.php | 1 + .../SequenceNumberGenerator.php | 1 + .../Component/Order/OrderInvoiceStates.php | 1 + .../Order/OrderInvoiceTransitions.php | 1 + .../Component/Order/OrderPaymentStates.php | 1 + .../Order/OrderPaymentTransitions.php | 1 + .../Component/Order/OrderSaleStates.php | 1 + .../Component/Order/OrderSaleTransitions.php | 1 + .../Component/Order/OrderShipmentStates.php | 1 + .../Order/OrderShipmentTransitions.php | 1 + src/CoreShop/Component/Order/OrderStates.php | 1 + .../Component/Order/OrderTransitions.php | 1 + .../Order/Payment/OrderPaymentProvider.php | 1 + .../Payment/OrderPaymentProviderInterface.php | 1 + .../Processable/ProcessableInterface.php | 1 + .../Processable/ProcessableOrderItems.php | 1 + .../Processor/CartItemProcessorInterface.php | 1 + .../Processor/CartProcessorInterface.php | 1 + .../Processor/CompositeCartProcessor.php | 1 + src/CoreShop/Component/Order/QuoteStates.php | 15 ++++++ .../Component/Order/QuoteTransitions.php | 15 ++++++ .../OrderDocumentRendererInterface.php | 1 + .../CartItemRepositoryInterface.php | 1 + .../CartPriceRuleRepositoryInterface.php | 1 + ...artPriceRuleVoucherRepositoryInterface.php | 1 + .../OrderDocumentRepositoryInterface.php | 1 + .../OrderInvoiceRepositoryInterface.php | 1 + .../OrderItemRepositoryInterface.php | 1 + .../Repository/OrderRepositoryInterface.php | 1 + .../OrderShipmentRepositoryInterface.php | 1 + .../Component/Order/ShipmentStates.php | 1 + .../Component/Order/ShipmentTransitions.php | 1 + .../StateResolver/StateResolverInterface.php | 1 + .../OrderDocumentItemTransformerInterface.php | 1 + .../OrderDocumentTransformerInterface.php | 1 + .../OrderItemToInvoiceItemTransformer.php | 1 + .../OrderItemToShipmentItemTransformer.php | 1 + .../Transformer/OrderToInvoiceTransformer.php | 1 + ...rderDocumentTransformerWorkflowApplier.php | 1 + .../OrderToShipmentTransformer.php | 1 + .../TransformerEventDispatcher.php | 1 + .../TransformerEventDispatcherInterface.php | 1 + .../Payment/Model/PayableInterface.php | 1 + .../Component/Payment/Model/Payment.php | 1 + .../Payment/Model/PaymentInterface.php | 1 + .../Payment/Model/PaymentProvider.php | 1 + .../Model/PaymentProviderInterface.php | 1 + .../Model/PaymentProviderTranslation.php | 1 + .../PaymentProviderTranslationInterface.php | 1 + .../Model/PaymentSettingsAwareInterface.php | 1 + .../Component/Payment/PaymentTransitions.php | 1 + .../PaymentProviderRepositoryInterface.php | 1 + .../Repository/PaymentRepositoryInterface.php | 1 + .../Resolver/PaymentProviderResolver.php | 1 + .../PaymentProviderResolverInterface.php | 1 + .../PayumPayment/Model/GatewayConfig.php | 1 + .../PayumPayment/Model/PaymentProvider.php | 1 + .../Model/PaymentProviderInterface.php | 1 + .../Model/PaymentSecurityToken.php | 1 + .../Pimcore/BatchProcessing/BatchListing.php | 1 + .../DataObjectBatchListing.php | 1 + .../DataObject/AbstractDefinitionUpdate.php | 1 + .../AbstractSluggableLinkGenerator.php | 1 + .../DataObject/BrickDefinitionUpdate.php | 1 + .../Pimcore/DataObject/ClassInstaller.php | 1 + .../DataObject/ClassInstallerInterface.php | 1 + .../Pimcore/DataObject/ClassUpdate.php | 1 + .../DataObject/ClassUpdateInterface.php | 1 + .../Pimcore/DataObject/DataLoader.php | 1 + .../DataObject/DataLoaderInterface.php | 1 + .../DefinitionFieldReNamerInterface.php | 1 + .../Pimcore/DataObject/EditmodeHelper.php | 1 + .../FieldCollectionDefinitionUpdate.php | 1 + .../DataObject/Grid/GridActionInterface.php | 1 + .../DataObject/Grid/GridFilterInterface.php | 1 + .../DataObject/GridConfigInstaller.php | 1 + .../GridConfigInstallerInterface.php | 1 + .../Pimcore/DataObject/InheritanceHelper.php | 1 + .../DataObject/LocaleFallbackHelper.php | 1 + .../Pimcore/DataObject/NoteService.php | 1 + .../DataObject/NoteServiceInterface.php | 1 + .../Pimcore/DataObject/ObjectCloner.php | 1 + .../DataObject/ObjectClonerInterface.php | 1 + .../Pimcore/DataObject/ObjectService.php | 1 + .../DataObject/ObjectServiceInterface.php | 1 + .../Pimcore/DataObject/UnpublishedHelper.php | 1 + .../Pimcore/DataObject/VersionHelper.php | 1 + .../Document/DocumentTagFactoryInterface.php | 1 + .../ClassDefinitionAlreadyExistsException.php | 1 + .../ClassDefinitionFieldNotFoundException.php | 1 + .../ClassDefinitionNotFoundException.php | 1 + .../Exception/SlugNotPossibleException.php | 1 + .../PHPFunctionsProvider.php | 1 + .../PimcoreLanguageProvider.php | 1 + src/CoreShop/Component/Pimcore/Mail.php | 1 + .../Pimcore/Mail/MailProcessorInterface.php | 1 + .../Pimcore/Migration/SharedTranslation.php | 1 + .../Component/Pimcore/ResourceLoader.php | 1 + .../Pimcore/Slug/SluggableInterface.php | 1 + .../Pimcore/Slug/SluggableLinkGenerator.php | 1 + .../Pimcore/Slug/SluggableSlugger.php | 1 + .../Slug/SluggableSluggerInterface.php | 1 + .../Extension/DataObjectRoutingExtension.php | 1 + .../CompositeDiscountCalculator.php | 1 + .../CompositeDiscountPriceCalculator.php | 1 + .../CompositeRetailPriceCalculator.php | 1 + .../MemoryCachedProductPriceCalculator.php | 1 + .../ProductDiscountCalculatorInterface.php | 1 + ...roductDiscountPriceCalculatorInterface.php | 1 + .../Calculator/ProductPriceCalculator.php | 1 + .../ProductPriceCalculatorInterface.php | 1 + .../ProductRetailPriceCalculatorInterface.php | 1 + .../NoDiscountPriceFoundException.php | 1 + .../Exception/NoPriceFoundException.php | 1 + .../Exception/NoRetailPriceFoundException.php | 1 + .../Product/Model/AbstractPriceRule.php | 1 + .../Component/Product/Model/Category.php | 1 + .../Product/Model/CategoryInterface.php | 1 + .../Component/Product/Model/Manufacturer.php | 1 + .../Product/Model/ManufacturerInterface.php | 1 + .../Product/Model/PriceRuleInterface.php | 1 + .../Product/Model/PriceRuleTranslation.php | 1 + .../Model/PriceRuleTranslationInterface.php | 1 + .../Component/Product/Model/Product.php | 1 + .../Product/Model/ProductInterface.php | 1 + .../Product/Model/ProductPriceRule.php | 1 + .../Model/ProductPriceRuleInterface.php | 1 + .../Model/ProductPriceRuleTranslation.php | 1 + .../ProductPriceRuleTranslationInterface.php | 1 + .../Model/ProductSpecificPriceRule.php | 1 + .../ProductSpecificPriceRuleInterface.php | 1 + .../ProductSpecificPriceRuleTranslation.php | 1 + ...tSpecificPriceRuleTranslationInterface.php | 1 + .../Component/Product/Model/ProductUnit.php | 1 + .../Product/Model/ProductUnitDefinition.php | 1 + .../Model/ProductUnitDefinitionInterface.php | 1 + .../Model/ProductUnitDefinitionPrice.php | 1 + .../ProductUnitDefinitionPriceInterface.php | 1 + .../Product/Model/ProductUnitDefinitions.php | 1 + .../Model/ProductUnitDefinitionsInterface.php | 1 + .../Product/Model/ProductUnitInterface.php | 1 + .../Product/Model/ProductUnitTranslation.php | 1 + .../Model/ProductUnitTranslationInterface.php | 1 + .../CategoryRepositoryInterface.php | 1 + .../PriceRuleRepositoryInterface.php | 1 + .../ProductPriceRuleRepositoryInterface.php | 1 + .../Repository/ProductRepositoryInterface.php | 1 + ...ctSpecificPriceRuleRepositoryInterface.php | 1 + ...ductUnitDefinitionsRepositoryInterface.php | 1 + .../ProductUnitRepositoryInterface.php | 1 + .../Rule/Action/ActionProcessorInterface.php | 1 + .../Action/DiscountAmountActionProcessor.php | 1 + .../Action/DiscountPercentActionProcessor.php | 1 + .../Action/DiscountPriceActionProcessor.php | 1 + .../Rule/Action/PriceActionProcessor.php | 1 + .../ProductActionProcessorInterface.php | 1 + ...roductDiscountActionProcessorInterface.php | 1 + ...tDiscountPriceActionProcessorInterface.php | 1 + .../ProductPriceActionProcessorInterface.php | 1 + ...roductSpecificActionProcessorInterface.php | 1 + .../Calculator/ProductPriceRuleCalculator.php | 1 + .../ProductConditionCheckerInterface.php | 1 + ...oductSpecificConditionCheckerInterface.php | 1 + .../Condition/TimeSpanConditionChecker.php | 1 + .../Fetcher/CompositeValidRuleFetcher.php | 1 + .../Fetcher/MemoryCachedValidRuleFetcher.php | 1 + .../Fetcher/ValidProductPriceRuleFetcher.php | 1 + .../ValidProductSpecificPriceRuleFetcher.php | 1 + .../Fetcher/ValidRulesFetcherInterface.php | 1 + .../Calculator/CalculatorInterface.php | 1 + .../Calculator/VolumeCalculator.php | 1 + .../Detector/QuantityReferenceDetector.php | 1 + .../QuantityReferenceDetectorInterface.php | 1 + .../ProductQuantityPriceRules/Events.php | 1 + .../Exception/NoPriceFoundException.php | 1 + .../Exception/NoRuleFoundException.php | 1 + .../Fetcher/QuantityPriceFetcher.php | 1 + .../Fetcher/QuantityPriceFetcherInterface.php | 1 + .../Fetcher/QuantityRuleFetcher.php | 1 + .../Fetcher/QuantityRuleFetcherInterface.php | 1 + .../Model/ProductQuantityPriceRule.php | 1 + .../ProductQuantityPriceRuleInterface.php | 1 + .../Model/QuantityRange.php | 1 + .../Model/QuantityRangeInterface.php | 1 + .../QuantityRangePriceAwareInterface.php | 1 + ...ctQuantityPriceRuleRepositoryInterface.php | 1 + .../Rule/Action/PercentageDecreaseAction.php | 1 + .../Rule/Action/PercentageIncreaseAction.php | 1 + ...roductQuantityPriceRuleActionInterface.php | 1 + .../QuantityRuleConditionCheckerInterface.php | 1 + .../Fetcher/MemoryCachedValidRuleFetcher.php | 1 + .../ValidProductQuantityPriceRuleFetcher.php | 1 + .../Fetcher/ValidRulesFetcherInterface.php | 1 + .../Registry/ExistingServiceException.php | 1 + .../Registry/NonExistingServiceException.php | 1 + .../PrioritizedCompositeServicePass.php | 1 + .../Registry/PrioritizedServiceRegistry.php | 1 + .../PrioritizedServiceRegistryInterface.php | 1 + .../Component/Registry/PriorityMap.php | 1 + .../Registry/RegisterRegistryTypePass.php | 1 + .../RegisterSimpleRegistryTypePass.php | 1 + .../Component/Registry/ServiceRegistry.php | 1 + .../Registry/ServiceRegistryInterface.php | 1 + .../Resource/DataHub/DoctrineProvider.php | 1 + .../Resource/DataHub/QueryType/Resource.php | 1 + .../DataHub/QueryType/ResourceList.php | 1 + .../DataHub/Resolver/DoctrineField.php | 1 + .../DataHub/Resolver/DoctrineToMany.php | 1 + .../DataHub/Resolver/DoctrineToOne.php | 1 + .../Resource/DataHub/Type/ArrayType.php | 1 + .../Resource/DataHub/Type/JsonType.php | 1 + .../Doctrine/Type/BigIntIntegerType.php | 1 + .../Resource/Doctrine/Type/PimcoreAsset.php | 1 + .../Doctrine/Type/PimcoreDocument.php | 1 + .../Resource/Doctrine/Type/PimcoreObject.php | 1 + .../Resource/Doctrine/Type/PimcoreSite.php | 1 + .../ImplementedByPimcoreException.php | 1 + .../Exception/NiceValidationException.php | 15 ++++++ .../Exception/UnexpectedTypeException.php | 1 + .../Exception/UnsupportedMethodException.php | 1 + .../Component/Resource/Factory/Factory.php | 1 + .../Resource/Factory/FactoryInterface.php | 15 ++++++ .../Resource/Factory/PimcoreFactory.php | 1 + .../Factory/PimcoreFactoryInterface.php | 1 + .../Factory/PimcoreRepositoryFactory.php | 1 + .../Resource/Factory/RepositoryFactory.php | 1 + .../Factory/RepositoryFactoryInterface.php | 1 + .../Resource/Factory/TranslatableFactory.php | 1 + .../Factory/TranslatableFactoryInterface.php | 1 + .../Component/Resource/Metadata/Metadata.php | 1 + .../Resource/Metadata/MetadataInterface.php | 1 + .../Component/Resource/Metadata/Registry.php | 1 + .../Resource/Metadata/RegistryInterface.php | 1 + .../Resource/Model/AbstractObject.php | 1 + .../Resource/Model/AbstractResource.php | 1 + .../Resource/Model/AbstractTranslation.php | 1 + .../Resource/Model/ResourceInterface.php | 1 + .../Resource/Model/SetValuesTrait.php | 1 + .../Resource/Model/TimestampableInterface.php | 1 + .../Resource/Model/TimestampableTrait.php | 1 + .../Resource/Model/ToggleableInterface.php | 1 + .../Resource/Model/ToggleableTrait.php | 1 + .../Resource/Model/TranslatableInterface.php | 1 + .../Resource/Model/TranslatableTrait.php | 1 + .../Resource/Model/TranslationInterface.php | 1 + .../Model/AbstractPimcoreFieldcollection.php | 1 + .../Pimcore/Model/AbstractPimcoreModel.php | 1 + .../Pimcore/Model/PimcoreModelInterface.php | 15 ++++++ .../Pimcore/ResourceDocumentTagFactory.php | 1 + .../PimcoreDaoRepositoryInterface.php | 1 + .../Repository/PimcoreRepositoryInterface.php | 1 + .../Repository/RepositoryInterface.php | 1 + .../Service/FolderCreationService.php | 1 + .../FolderCreationServiceInterface.php | 1 + .../Resource/Storage/StorageInterface.php | 1 + .../TokenGenerator/UniqueTokenGenerator.php | 1 + .../PimcoreTranslationLocaleProvider.php | 1 + .../TranslationLocaleProviderInterface.php | 1 + .../TranslatableEntityLocaleAssigner.php | 1 + ...nslatableEntityLocaleAssignerInterface.php | 1 + .../RuleAvailabilityAssessorInterface.php | 1 + .../Condition/ConditionCheckerInterface.php | 1 + .../Rule/Condition/NestedConditionChecker.php | 1 + .../RuleConditionsValidationProcessor.php | 1 + ...ConditionsValidationProcessorInterface.php | 1 + .../Condition/RuleValidationProcessor.php | 1 + .../RuleValidationProcessorInterface.php | 1 + ...eableRuleConditionsValidationProcessor.php | 1 + ...ConditionsValidationProcessorInterface.php | 1 + src/CoreShop/Component/Rule/Model/Action.php | 1 + .../Component/Rule/Model/ActionInterface.php | 1 + .../Component/Rule/Model/Condition.php | 1 + .../Rule/Model/ConditionInterface.php | 1 + .../Component/Rule/Model/RuleInterface.php | 1 + .../Component/Rule/Model/RuleTrait.php | 1 + .../Repository/RuleRepositoryInterface.php | 1 + .../SEO/Extractor/DescriptionExtractor.php | 1 + .../SEO/Extractor/DocumentExtractor.php | 1 + .../SEO/Extractor/ExtractorInterface.php | 1 + .../SEO/Extractor/ImageExtractor.php | 1 + .../Component/SEO/Extractor/OGExtractor.php | 1 + .../SEO/Extractor/TitleExtractor.php | 1 + .../SEO/Model/PimcoreSEOAwareInterface.php | 1 + .../Component/SEO/Model/SEOAwareInterface.php | 1 + .../SEO/Model/SEOImageAwareInterface.php | 1 + .../Component/SEO/Model/SEOMetadata.php | 1 + .../SEO/Model/SEOMetadataInterface.php | 1 + .../SEO/Model/SEOOpenGraphAwareInterface.php | 1 + .../Component/SEO/SEOPresentation.php | 1 + .../SEO/SEOPresentationInterface.php | 1 + .../Sequence/Factory/SequenceFactory.php | 1 + .../Factory/SequenceFactoryInterface.php | 1 + .../Sequence/Generator/SequenceGenerator.php | 1 + .../Generator/SequenceGeneratorInterface.php | 1 + .../Component/Sequence/Model/Sequence.php | 1 + .../Sequence/Model/SequenceInterface.php | 1 + .../SequenceRepositoryInterface.php | 1 + .../Calculator/CarrierPriceCalculator.php | 1 + .../CarrierPriceCalculatorInterface.php | 1 + .../CarrierShippingRulePriceCalculator.php | 1 + .../Calculator/CompositePriceCalculator.php | 1 + .../TaxedShippingCalculatorInterface.php | 1 + .../Checker/CarrierShippingRuleChecker.php | 1 + .../CarrierShippingRuleCheckerInterface.php | 1 + .../NoShippingPriceFoundException.php | 1 + .../UnresolvedDefaultCarrierException.php | 1 + .../Component/Shipping/Model/Carrier.php | 1 + .../Shipping/Model/CarrierAwareInterface.php | 1 + .../Shipping/Model/CarrierAwareTrait.php | 1 + .../Shipping/Model/CarrierInterface.php | 1 + .../Shipping/Model/CarrierTranslation.php | 1 + .../Model/CarrierTranslationInterface.php | 1 + .../Shipping/Model/ShippableInterface.php | 1 + .../Shipping/Model/ShippableItemInterface.php | 1 + .../Component/Shipping/Model/ShippingRule.php | 1 + .../Shipping/Model/ShippingRuleGroup.php | 1 + .../Model/ShippingRuleGroupInterface.php | 1 + .../Shipping/Model/ShippingRuleInterface.php | 1 + .../Processor/ShippingRuleActionProcessor.php | 1 + .../Shipping/Resolver/CarriersResolver.php | 1 + .../Resolver/CarriersResolverInterface.php | 1 + .../DefaultCarrierResolverInterface.php | 1 + .../Action/AdditionPercentActionProcessor.php | 1 + .../CarrierActionProcessorInterface.php | 1 + .../CarrierPriceActionProcessorInterface.php | 1 + ...ceModificationActionProcessorInterface.php | 1 + .../Action/DiscountPercentActionProcessor.php | 1 + .../Action/ShippingRuleActionProcessor.php | 1 + .../Condition/AbstractConditionChecker.php | 1 + .../Rule/Condition/AmountConditionChecker.php | 1 + .../Condition/DimensionConditionChecker.php | 1 + .../Condition/PostcodeConditionChecker.php | 1 + .../ShippingConditionCheckerInterface.php | 1 + .../ShippingRuleConditionChecker.php | 1 + .../Rule/Condition/WeightConditionChecker.php | 1 + .../ShippingRuleActionProcessorInterface.php | 1 + .../TaxCalculationStrategyInterface.php | 1 + .../CompositeShippableCarrierValidator.php | 1 + .../ShippableCarrierValidatorInterface.php | 1 + .../ShippingRuleCarrierValidator.php | 1 + .../Context/CompositeStorageListContext.php | 1 + .../Context/StorageListContextInterface.php | 1 + .../Context/StorageListFactoryContext.php | 1 + .../Context/StorageListNotFoundException.php | 1 + ...ustomerAndStoreBasedStorageListContext.php | 1 + ...SessionAndStoreBasedStorageListContext.php | 1 + .../Context/StoreBasedStorageListContext.php | 1 + ...stomerAndStoreAwareRepositoryInterface.php | 1 + .../StorageList/DTO/AddToStorageList.php | 1 + .../DTO/AddToStorageListInterface.php | 1 + .../Factory/AddToStorageListFactory.php | 1 + .../AddToStorageListFactoryInterface.php | 1 + .../Factory/StorageListFactory.php | 1 + .../Factory/StorageListItemFactory.php | 1 + .../StorageListItemFactoryInterface.php | 1 + .../Manager/StorageListManagerInterface.php | 1 + .../StorageListPimcoreModelManager.php | 1 + .../StorageList/Model/StorageList.php | 1 + .../Model/StorageListInterface.php | 1 + .../StorageList/Model/StorageListItem.php | 1 + .../Model/StorageListItemInterface.php | 1 + .../PimcoreStorageListRepositoryInterface.php | 1 + .../StorageListRepositoryInterface.php | 1 + .../SessionStorageListModifier.php | 1 + .../StorageList/SessionStorageManager.php | 1 + .../StorageList/SimpleStorageListModifier.php | 1 + .../StorageListItemModelEqualsResolver.php | 1 + .../StorageListItemQuantityModifier.php | 1 + ...orageListItemQuantityModifierInterface.php | 1 + .../StorageList/StorageListItemResolver.php | 1 + .../StorageListItemResolverInterface.php | 1 + .../StorageListManagerInterface.php | 1 + .../StorageListModifierInterface.php | 1 + .../StorageList/StorageListsManager.php | 19 +++++++- .../Store/Context/CompositeStoreContext.php | 1 + .../Store/Context/FixedStoreContext.php | 1 + .../RequestBased/CachedStoreContext.php | 1 + .../RequestBased/CompositeRequestResolver.php | 1 + .../PimcoreAdminSiteBasedRequestResolver.php | 1 + .../PimcoreAreaBrickRenderResolver.php | 1 + .../RequestBased/RequestResolverInterface.php | 1 + .../RequestBased/SiteBasedRequestResolver.php | 1 + .../Context/RequestBased/StoreContext.php | 1 + .../Store/Context/StoreContextInterface.php | 1 + .../Store/Context/StoreNotFoundException.php | 1 + src/CoreShop/Component/Store/Model/Store.php | 1 + .../Store/Model/StoreAwareInterface.php | 1 + .../Component/Store/Model/StoreAwareTrait.php | 1 + .../Component/Store/Model/StoreInterface.php | 1 + .../Store/Model/StoresAwareInterface.php | 1 + .../Store/Model/StoresAwareTrait.php | 1 + .../Repository/StoreRepositoryInterface.php | 1 + .../Calculator/TaxCalculatorInterface.php | 1 + .../Calculator/TaxRulesTaxCalculator.php | 1 + .../Taxation/Collector/TaxCollector.php | 1 + .../Collector/TaxCollectorInterface.php | 1 + .../Component/Taxation/Model/TaxItem.php | 1 + .../Taxation/Model/TaxItemInterface.php | 1 + .../Component/Taxation/Model/TaxRate.php | 1 + .../Taxation/Model/TaxRateInterface.php | 1 + .../Taxation/Model/TaxRateTranslation.php | 1 + .../Model/TaxRateTranslationInterface.php | 1 + .../Component/Taxation/Model/TaxRule.php | 1 + .../Component/Taxation/Model/TaxRuleGroup.php | 1 + .../Taxation/Model/TaxRuleGroupInterface.php | 1 + .../Taxation/Model/TaxRuleInterface.php | 1 + .../Repository/TaxRateRepositoryInterface.php | 1 + .../Repository/TaxRuleRepositoryInterface.php | 1 + .../Tracking/Extractor/CompositeExtractor.php | 1 + .../Extractor/TrackingExtractorInterface.php | 1 + .../Tracking/Tracker/CompositeTracker.php | 1 + .../Tracking/Tracker/TrackerInterface.php | 1 + src/CoreShop/Component/User/Model/User.php | 1 + .../User/Model/UserAwareInterface.php | 1 + .../Component/User/Model/UserInterface.php | 1 + .../Repository/UserRepositoryInterface.php | 1 + .../Component/Variant/AttributeCollector.php | 1 + .../Variant/AttributeCollectorInterface.php | 1 + .../Component/Variant/Model/Attribute.php | 1 + .../Variant/Model/AttributeColor.php | 1 + .../Variant/Model/AttributeColorInterface.php | 15 ++++++ .../Variant/Model/AttributeGroup.php | 1 + .../Variant/Model/AttributeGroupInterface.php | 15 ++++++ .../Variant/Model/AttributeInterface.php | 15 ++++++ .../Variant/Model/AttributeValue.php | 1 + .../Variant/Model/AttributeValueInterface.php | 1 + .../Model/ProductVariantAwareInterface.php | 17 ++++++- .../Variant/Model/ProductVariantTrait.php | 1 + .../Model/Resolved/ResolvedAttribute.php | 1 + .../Model/Resolved/ResolvedAttributeGroup.php | 1 + .../Variant/Model/Resolved/ResolvedIndex.php | 1 + .../Component/Wishlist/Model/Wishlist.php | 1 + .../Wishlist/Model/WishlistInterface.php | 1 + .../Component/Wishlist/Model/WishlistItem.php | 1 + .../Wishlist/Model/WishlistItemInterface.php | 1 + .../Model/WishlistProductInterface.php | 1 + .../WishlistItemRepositoryInterface.php | 1 + .../WishlistRepositoryInterface.php | 1 + .../Wishlist/Wishlist/WishlistModifier.php | 1 + .../Component/Wishlist/WishlistEvents.php | 1 + src/Kernel.php | 2 +- 2238 files changed, 2553 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/codestyles.yml diff --git a/.github/workflows/codestyles.yml b/.github/workflows/codestyles.yml new file mode 100644 index 0000000000..c4b8f48919 --- /dev/null +++ b/.github/workflows/codestyles.yml @@ -0,0 +1,48 @@ +name: Coding standard refactor + +on: + schedule: + - cron: "0 2 * * MON" # Run at 2am every Monday + workflow_dispatch: ~ + +jobs: + coding-standard: + runs-on: ubuntu-latest + name: "Coding standard refactor" + + timeout-minutes: 5 + + strategy: + fail-fast: false + matrix: + branch: [ "master" ] + + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ matrix.branch }} + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.0 # the lowest PHP version working with ECS + + - name: Install PHP dependencies + run: composer update --no-interaction --no-scripts + + - name: Run ECS + run: vendor/bin/ecs check --fix src + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v4 + with: + commit-message: '[CS] Refactor' + author: CoreShop + title: '[CS] Refactor' + body: | + This PR has been generated automatically to fix code-styles + labels: | + Enhancement + branch: coding-standard/refactor-${{ matrix.branch }} + delete-branch: true + base: ${{ matrix.branch }} \ No newline at end of file diff --git a/src/CoreShop/Behat/Context/Cli/InstallerContext.php b/src/CoreShop/Behat/Context/Cli/InstallerContext.php index cfa37995aa..7cb05e0548 100644 --- a/src/CoreShop/Behat/Context/Cli/InstallerContext.php +++ b/src/CoreShop/Behat/Context/Cli/InstallerContext.php @@ -1,4 +1,5 @@ getTypeIdentifier(); - } + }, ); } diff --git a/src/CoreShop/Component/Order/Model/Adjustment.php b/src/CoreShop/Component/Order/Model/Adjustment.php index db07b5c5d9..ee94bd994a 100644 --- a/src/CoreShop/Component/Order/Model/Adjustment.php +++ b/src/CoreShop/Component/Order/Model/Adjustment.php @@ -1,4 +1,5 @@ getTypeIdentifier(); - } + }, ); } diff --git a/src/CoreShop/Component/Order/Model/Order.php b/src/CoreShop/Component/Order/Model/Order.php index b19a92b52c..50158f7f53 100644 --- a/src/CoreShop/Component/Order/Model/Order.php +++ b/src/CoreShop/Component/Order/Model/Order.php @@ -1,4 +1,5 @@ getCartPriceRule()->getId() === $priceRule->getCartPriceRule()->getId() - && $item->getVoucherCode() === $priceRule->getVoucherCode()) { + if ($item->getCartPriceRule()->getId() === $priceRule->getCartPriceRule()->getId() && + $item->getVoucherCode() === $priceRule->getVoucherCode()) { $items->remove($i); break; @@ -124,8 +139,8 @@ public function hasPriceRule(PriceRuleItemInterface $priceRule): bool continue; } - if ($item->getCartPriceRule()->getId() === $priceRule->getCartPriceRule()->getId() - && $item->getVoucherCode() === $priceRule->getVoucherCode()) { + if ($item->getCartPriceRule()->getId() === $priceRule->getCartPriceRule()->getId() && + $item->getVoucherCode() === $priceRule->getVoucherCode()) { return true; } } @@ -136,14 +151,14 @@ public function hasPriceRule(PriceRuleItemInterface $priceRule): bool public function hasCartPriceRule( CartPriceRuleInterface $cartPriceRule, - CartPriceRuleVoucherCodeInterface $voucherCode = null + CartPriceRuleVoucherCodeInterface $voucherCode = null, ): bool { return null !== $this->getPriceRuleByCartPriceRule($cartPriceRule, $voucherCode); } public function getPriceRuleByCartPriceRule( CartPriceRuleInterface $cartPriceRule, - CartPriceRuleVoucherCodeInterface $voucherCode = null + CartPriceRuleVoucherCodeInterface $voucherCode = null, ): ?PriceRuleItemInterface { $items = $this->getPriceRuleItems(); diff --git a/src/CoreShop/Component/Order/Model/PurchasableInterface.php b/src/CoreShop/Component/Order/Model/PurchasableInterface.php index 220f3b3628..49f7a188e6 100644 --- a/src/CoreShop/Component/Order/Model/PurchasableInterface.php +++ b/src/CoreShop/Component/Order/Model/PurchasableInterface.php @@ -1,4 +1,5 @@ Date: Mon, 12 Sep 2022 18:16:13 +0200 Subject: [PATCH 3/3] [All] Refactor Code Styles --- .../Component/Core/Context/TokenBasedCustomerContext.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CoreShop/Component/Core/Context/TokenBasedCustomerContext.php b/src/CoreShop/Component/Core/Context/TokenBasedCustomerContext.php index 3815ee4442..b7cd6b60ab 100644 --- a/src/CoreShop/Component/Core/Context/TokenBasedCustomerContext.php +++ b/src/CoreShop/Component/Core/Context/TokenBasedCustomerContext.php @@ -1,4 +1,6 @@ -