Skip to content

Commit

Permalink
Fix CoreBundle errors
Browse files Browse the repository at this point in the history
  • Loading branch information
mpysiak committed Oct 21, 2024
1 parent 75000fc commit bd7fa7b
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 29 deletions.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@
"twig/intl-extra": "^3.13.0",
"twig/string-extra": "^3.13.0",
"twig/twig": "^3.14.0",
"webmozart/assert": "^1.9"
"webmozart/assert": "^1.9",
"winzou/state-machine-bundle": "^0.6"
},
"replace": {
"sylius/addressing": "self.version",
Expand Down
1 change: 1 addition & 0 deletions config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@
Symfony\UX\Icons\UXIconsBundle::class => ['all' => true],
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
Sylius\TwigExtra\Symfony\SyliusTwigExtraBundle::class => ['all' => true],
winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true],
];
2 changes: 1 addition & 1 deletion config/packages/test/_sylius.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
test_default_state_machine_adapter: 'symfony_workflow'
test_default_state_machine_adapter: 'winzou_state_machine'
test_sylius_state_machine_adapter: '%env(string:default:test_default_state_machine_adapter:TEST_SYLIUS_STATE_MACHINE_ADAPTER)%'

sylius_api:
Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,10 @@
"engines": {
"node": "^20 || ^22"
},
"engineStrict": true
"engineStrict": true,
"devDependencies": {
"@hotwired/stimulus": "^3.0.0",
"@symfony/stimulus-bridge": "^3.2.0",
"tom-select": "^2.2.2"
}
}
34 changes: 17 additions & 17 deletions src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,19 @@
</service>
<service id="sylius.resolver.taxation_address" alias="sylius.taxation_address_resolver" />

<service id="sylius.context.customer" class="Sylius\Bundle\CoreBundle\Context\CustomerContext">
<service id="sylius.context.customer" class="Sylius\Bundle\CoreBundle\Context\CustomerContext" public="true">
<argument type="service" id="security.token_storage" />
<argument type="service" id="security.authorization_checker" />
</service>
<service id="Sylius\Component\Customer\Context\CustomerContextInterface" alias="sylius.context.customer" />
<service id="Sylius\Component\Customer\Context\CustomerContextInterface" alias="sylius.context.customer" public="true" />

<service id="sylius.inventory.order_item_availability_checker" class="Sylius\Component\Core\Inventory\Checker\OrderItemAvailabilityChecker"/>
<service id="sylius.checker.inventory.order_item_availability" alias="sylius.inventory.order_item_availability_checker" />
<service id="Sylius\Component\Core\Inventory\Checker\OrderItemAvailabilityCheckerInterface" alias="sylius.inventory.order_item_availability_checker" />

<service id="sylius.inventory.order_inventory_operator" class="Sylius\Component\Core\Inventory\Operator\OrderInventoryOperator"/>
<service id="sylius.operator.inventory.order_inventory" alias="sylius.inventory.order_inventory_operator" />
<service id="Sylius\Component\Core\Inventory\Operator\OrderInventoryOperatorInterface" alias="sylius.inventory.order_inventory_operator" />
<service id="sylius.inventory.order_inventory_operator" class="Sylius\Component\Core\Inventory\Operator\OrderInventoryOperator" public="true"/>
<service id="sylius.operator.inventory.order_inventory" alias="sylius.inventory.order_inventory_operator" public="true" />
<service id="Sylius\Component\Core\Inventory\Operator\OrderInventoryOperatorInterface" alias="sylius.inventory.order_inventory_operator" public="true" />

<service id="sylius.custom_inventory.order_inventory_operator" class="Sylius\Bundle\CoreBundle\Doctrine\ORM\Inventory\Operator\OrderInventoryOperator" decorates="sylius.inventory.order_inventory_operator">
<argument type="service" id="sylius.custom_inventory.order_inventory_operator.inner" />
Expand All @@ -144,10 +144,10 @@
<argument type="service" id="sylius.factory.channel_price_history_config" />
</service>

<service id="sylius.factory.customer_after_checkout" class="Sylius\Component\Core\Factory\CustomerAfterCheckoutFactory">
<service id="sylius.factory.customer_after_checkout" class="Sylius\Component\Core\Factory\CustomerAfterCheckoutFactory" public="true">
<argument type="service" id="sylius.factory.customer" />
</service>
<service id="Sylius\Component\Core\Factory\CustomerAfterCheckoutFactoryInterface" alias="sylius.factory.customer_after_checkout" />
<service id="Sylius\Component\Core\Factory\CustomerAfterCheckoutFactoryInterface" alias="sylius.factory.customer_after_checkout" public="true" />

<service id="Sylius\Bundle\CoreBundle\Twig\ProductVariantsMapExtension">
<argument type="service" id="sylius.provider.product_variant_map" />
Expand All @@ -161,11 +161,11 @@
<tag name="twig.extension" />
</service>

<service id="sylius.unique_id_based_order_token_assigner" class="Sylius\Component\Core\TokenAssigner\UniqueIdBasedOrderTokenAssigner">
<service id="sylius.unique_id_based_order_token_assigner" class="Sylius\Component\Core\TokenAssigner\UniqueIdBasedOrderTokenAssigner" public="true">
<argument type="service" id="sylius.random_generator" />
<argument>%sylius_core.order_token_length%</argument>
</service>
<service id="sylius.assigner.order_token.unique_id_based" alias="sylius.unique_id_based_order_token_assigner" />
<service id="sylius.assigner.order_token.unique_id_based" alias="sylius.unique_id_based_order_token_assigner" public="true" />
<service id="Sylius\Component\Core\TokenAssigner\OrderTokenAssignerInterface" alias="sylius.unique_id_based_order_token_assigner" />

<service id="sylius.customer_unique_address_adder" class="Sylius\Component\Core\Customer\CustomerUniqueAddressAdder">
Expand All @@ -174,11 +174,11 @@
<service id="sylius.adder.customer.unique_address" alias="sylius.customer_unique_address_adder" />
<service id="Sylius\Component\Core\Customer\CustomerAddressAdderInterface" alias="sylius.customer_unique_address_adder" />

<service id="sylius.customer_order_addresses_saver" class="Sylius\Component\Core\Customer\CustomerOrderAddressesSaver">
<service id="sylius.customer_order_addresses_saver" class="Sylius\Component\Core\Customer\CustomerOrderAddressesSaver" public="true">
<argument type="service" id="sylius.adder.customer.unique_address" />
</service>
<service id="sylius.saver.customer.order_addresses" alias="sylius.customer_order_addresses_saver" />
<service id="Sylius\Component\Core\Customer\OrderAddressesSaverInterface" alias="sylius.customer_order_addresses_saver" />
<service id="sylius.saver.customer.order_addresses" alias="sylius.customer_order_addresses_saver" public="true" />
<service id="Sylius\Component\Core\Customer\OrderAddressesSaverInterface" alias="sylius.customer_order_addresses_saver" public="true" />

<service id="sylius.order_item_quantity_modifier.limiting" class="Sylius\Component\Core\Cart\Modifier\LimitingOrderItemQuantityModifier" decorates="sylius.modifier.order_item_quantity" decoration-priority="256">
<argument type="service" id="sylius.order_item_quantity_modifier.limiting.inner" />
Expand Down Expand Up @@ -266,9 +266,9 @@
<argument type="service" id="doctrine.orm.entity_manager" />
</service>

<service id="sylius.order_item_names_setter" class="Sylius\Component\Core\Order\OrderItemNamesSetter" />
<service id="sylius.setter.order.item_names" alias="sylius.order_item_names_setter" />
<service id="Sylius\Component\Core\Order\OrderItemNamesSetterInterface" alias="sylius.order_item_names_setter" />
<service id="sylius.order_item_names_setter" class="Sylius\Component\Core\Order\OrderItemNamesSetter" public="true" />
<service id="sylius.setter.order.item_names" alias="sylius.order_item_names_setter" public="true" />
<service id="Sylius\Component\Core\Order\OrderItemNamesSetterInterface" alias="sylius.order_item_names_setter" public="true" />

<service id="sylius.grid_filter.resource_autocomplete" class="Sylius\Component\Core\Grid\Filter\ResourceAutocompleteFilter">
<tag name="sylius.grid_filter" type="resource_autocomplete" form-type="Sylius\Bundle\CoreBundle\Form\Type\Grid\Filter\ResourceAutocompleteFilterType" />
Expand Down Expand Up @@ -309,7 +309,7 @@
</service>
<service id="sylius.registry.statistics.orders_totals_providers" alias="Sylius\Component\Core\Statistics\Registry\OrdersTotalsProvidersRegistryInterface" />

<service id="Sylius\Component\Core\Positioner\PositionerInterface" class="Sylius\Component\Core\Positioner\Positioner" />
<service id="sylius.positioner" alias="Sylius\Component\Core\Positioner\PositionerInterface" />
<service id="Sylius\Component\Core\Positioner\PositionerInterface" class="Sylius\Component\Core\Positioner\Positioner" public="true" />
<service id="sylius.positioner" alias="Sylius\Component\Core\Positioner\PositionerInterface" public="true" />
</services>
</container>
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<argument>cart</argument>
<tag name="sylius.order_processor" priority="0"/>
</service>
<service id="sylius.order_processing.order_payment_processor.after_checkout" class="Sylius\Component\Core\OrderProcessing\OrderPaymentProcessor">
<service id="sylius.order_processing.order_payment_processor.after_checkout" class="Sylius\Component\Core\OrderProcessing\OrderPaymentProcessor" public="true">
<argument type="service" id="sylius.provider.payment.order" />
<argument type="service" id="sylius.remover.payment.order" />
<argument>%sylius.order_payment_processor.after_checkout.unsupported_states%</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@
<service id="sylius.applicator.promotion.units_adjustments" alias="sylius.promotion.units_promotion_adjustments_applicator" />
<service id="Sylius\Component\Core\Promotion\Applicator\UnitsPromotionAdjustmentsApplicatorInterface" alias="sylius.promotion.units_promotion_adjustments_applicator" />

<service id="sylius.promotion_usage_modifier" class="Sylius\Component\Core\Promotion\Modifier\OrderPromotionsUsageModifier">
<service id="sylius.promotion_usage_modifier" class="Sylius\Component\Core\Promotion\Modifier\OrderPromotionsUsageModifier" public="true">
<argument type="service" id="sylius.manager.promotion" />
</service>
<service id="sylius.modifier.promotion.order_usage" alias="sylius.promotion_usage_modifier" />
<service id="Sylius\Component\Core\Promotion\Modifier\OrderPromotionsUsageModifierInterface" alias="sylius.promotion_usage_modifier" />
<service id="sylius.modifier.promotion.order_usage" alias="sylius.promotion_usage_modifier" public="true" />
<service id="Sylius\Component\Core\Promotion\Modifier\OrderPromotionsUsageModifierInterface" alias="sylius.promotion_usage_modifier" public="true" />

<service id="sylius.promotion_rule_updater.has_taxon" class="Sylius\Component\Core\Promotion\Updater\Rule\HasTaxonRuleUpdater">
<argument type="service" id="sylius.repository.promotion_rule" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
>
<services>
<defaults public="true" />

<service id="sylius.state_resolver.order" class="Sylius\Component\Core\StateResolver\OrderStateResolver">
<argument type="service" id="sylius_abstraction.state_machine" />
</service>
<service id="sylius.state_resolver.order_checkout" class="Sylius\Component\Core\StateResolver\CheckoutStateResolver" public="true">
<service id="sylius.state_resolver.order_checkout" class="Sylius\Component\Core\StateResolver\CheckoutStateResolver">
<argument type="service" id="sylius_abstraction.state_machine" />
<argument type="service" id="sylius.checker.order_payment_method_selection_requirement" />
<argument type="service" id="sylius.checker.order_shipping_method_selection_requirement" />
</service>
<service id="sylius.state_resolver.checkout" alias="sylius.state_resolver.order_checkout" public="true" />
<service id="sylius.state_resolver.checkout" alias="sylius.state_resolver.order_checkout" />
<service id="sylius.state_resolver.order_payment" class="Sylius\Component\Core\StateResolver\OrderPaymentStateResolver">
<argument type="service" id="sylius_abstraction.state_machine" />
</service>
Expand Down
6 changes: 3 additions & 3 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,6 @@
"php-http/message": {
"version": "1.7.0"
},
"php-http/message-factory": {
"version": "v1.0.2"
},
"phparkitect/phparkitect": {
"version": "0.2.9"
},
Expand Down Expand Up @@ -984,5 +981,8 @@
},
"willdurand/negotiation": {
"version": "v2.3.1"
},
"winzou/state-machine-bundle": {
"version": "v0.6.2"
}
}

0 comments on commit bd7fa7b

Please sign in to comment.