Skip to content

[UPMERGE] 1.7 -> 2.0 #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoResponseMate merged 11 commits into from
Jan 2, 2026
Merged

[UPMERGE] 1.7 -> 2.0 #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c3e6553
[Maintenance] Fix address setting flow in express checkout
NoResponseMate Oct 23, 2025
2c49392
[Admin][PaymentMethod] Add validation to sandbox paypal fields
NoResponseMate Oct 23, 2025
feaafce
[Maintenance] Fix address setting flow in express checkout (#408)
GSadee Oct 28, 2025
27e57c1
[Admin][PaymentMethod] Add validation to sandbox paypal fields (#409)
GSadee Oct 28, 2025
8aed6d9
fix(di): use phpseclib3 instead of phpseclib
kevin-blackbird Dec 18, 2025
6d46a1c
fix(di): use phpseclib3 instead of phpseclib (#414)
NoResponseMate Dec 19, 2025
de29b5d
[Maintenance][CI] Add container validation
NoResponseMate Dec 19, 2025
b19c782
[Maintenance][CI] Add container validation (#415)
Rafikooo Dec 19, 2025
a1a71e8
[Maintenance][CI] Exclude upmerge branches from push builds
NoResponseMate Jan 2, 2026
fb1ee77
[Maintenance][CI] Exclude upmerge branches from push builds (#418)
NoResponseMate Jan 2, 2026
1631e83
Resolve conflicts between 1.7 and 2.0
NoResponseMate Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches-ignore:
- 'dependabot/**'
- 'upmerge/**'
pull_request: ~
release:
types: [ created ]
Expand Down Expand Up @@ -202,8 +203,8 @@ jobs:
run: vendor/bin/console cache:warmup -vvv

-
name: Load fixtures in test application
run: vendor/bin/console sylius:fixtures:load -n
name: Validate container
run: vendor/bin/console lint:container -vvv

- name: Run security check
run: symfony security:check
Expand All @@ -213,8 +214,8 @@ jobs:
run: composer validate --ansi --strict

-
name: Validate container
run: vendor/bin/console lint:container
name: Load fixtures in test application
run: vendor/bin/console sylius:fixtures:load -n

-
name: Run Non-unit PHPUnit tests
Expand Down
13 changes: 6 additions & 7 deletions src/Controller/ProcessPayPalOrderAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,13 @@ public function __invoke(Request $request): Response
$address->setPostcode($purchaseUnit['shipping']['address']['postal_code']);
$address->setCountryCode($purchaseUnit['shipping']['address']['country_code']);

$order->setShippingAddress(clone $address);
$order->setBillingAddress(clone $address);

$this->stateMachineFactory->apply($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_ADDRESS);

if ($this->stateMachineFactory->can($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_SELECT_SHIPPING)) {
$this->stateMachineFactory->apply($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_SELECT_SHIPPING);
} elseif ($this->stateMachineFactory->can($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_SKIP_SHIPPING)) {
$this->stateMachineFactory->apply($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_SKIP_SHIPPING);
}
} else {
$address->setFirstName($customer->getFirstName());
Expand All @@ -117,16 +118,14 @@ public function __invoke(Request $request): Response
$address->setPostcode($defaultAddress ? $defaultAddress->getPostcode() : '');
$address->setCountryCode($data['payer']['address']['country_code']);

$order->setShippingAddress(clone $address);
$order->setBillingAddress(clone $address);

$this->stateMachineFactory->apply($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_ADDRESS);
}

$order->setShippingAddress(clone $address);
$order->setBillingAddress(clone $address);

if ($this->stateMachineFactory->can($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_SELECT_PAYMENT)) {
$this->stateMachineFactory->apply($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_SELECT_PAYMENT);
} elseif ($this->stateMachineFactory->can($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_SKIP_PAYMENT)) {
$this->stateMachineFactory->apply($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_SKIP_PAYMENT);
}

$this->orderManager->flush();
Expand Down
16 changes: 13 additions & 3 deletions src/Form/Type/PayPalConfigurationType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\Validator\Constraints\NotBlank;

final class PayPalConfigurationType extends AbstractType
{
Expand Down Expand Up @@ -48,9 +49,18 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
$form
->add('sylius_merchant_id', HiddenType::class, ['data' => self::SANDBOX_SYLIUS_MERCHANT_ID, 'attr' => ['readonly' => true]])
->add('partner_attribution_id', HiddenType::class, ['data' => self::SANDBOX_ATTRIBUTION_ID, 'attr' => ['readonly' => true]])
->add('client_id', TextType::class, ['label' => 'sylius_paypal.client_id'])
->add('client_secret', TextType::class, ['label' => 'sylius_paypal.client_secret'])
->add('merchant_id', TextType::class, ['label' => 'sylius_paypal.merchant_id'])
->add('client_id', TextType::class, [
'label' => 'sylius_paypal.client_id',
'constraints' => [new NotBlank(['groups' => 'sylius'])],
])
->add('client_secret', TextType::class, [
'label' => 'sylius_paypal.client_secret',
'constraints' => [new NotBlank(['groups' => 'sylius'])],
])
->add('merchant_id', TextType::class, [
'label' => 'sylius_paypal.merchant_id',
'constraints' => [new NotBlank(['groups' => 'sylius'])],
])
;
} else {
$form
Expand Down