kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[UPMERGE] 2.0 -> payment-request (#17050)

Browse source 
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
This commit is contained in:
Grzegorz Sadowski 2024-09-30 06:51:46 +02:00 • committed by GitHub
commit c2ea62cbe2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 38 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
docs/book/installation/installation.rst
View file

@ -19,6 +19,18 @@ To begin creating your new project, run this command:
composer create-project sylius/sylius-standard acme
.. tip::
We are about to release a new major version of Sylius, which is going to be 2.0.
Worry not, upgrading from 1.x to 2.x will be possible.
It is currently recommended to start with 1.x and upgrade the project once 2.0 is there,
but if you'd like to start playing around with the still-in-progress version, you can use this command to set the environment
on Sylius 2.0-ALPHA.X/BETA.X.
.. code-block:: bash
composer composer create-project --stability=dev sylius/sylius-standard:2.0.x-dev acme
.. note::
Make sure to use PHP ^8.1. Using an older PHP version will result in installing an older version of Sylius.

12
docs/getting-started-with-sylius/installation.rst
View file

@ -28,6 +28,18 @@ The easiest way to install Sylius on your local machine is to use the following
It will create a ``MyFirstShop`` directory with a brand new Sylius application inside.
.. tip::
We are about to release a new major version of Sylius, which is going to be 2.0.
Worry not, upgrading from 1.x to 2.x will be possible.
It is currently recommended to start with 1.x and upgrade the project once 2.0 is there,
but if you'd like to start playing around with the still-in-progress version, you can use this command to set the environment
on Sylius 2.0-ALPHA.X/BETA.X.
.. code-block:: bash
composer composer create-project --stability=dev sylius/sylius-standard:2.0.x-dev acme
.. note::
Are you familiar with Docker? Check out the :doc:`Sylius Installation Guide with Docker </book/installation/installation_with_docker>`

12
src/Sylius/Bundle/AdminBundle/EventListener/AdminFilterSubscriber.php
View file

@ -33,7 +33,7 @@ final class AdminFilterSubscriber implements EventSubscriberInterface
public function onKernelRequest(RequestEvent $event): void
{
if (!$this->isMainRequest($event)) {
if (!$event->isMainRequest()) {
return;
}
@ -58,16 +58,6 @@ final class AdminFilterSubscriber implements EventSubscriberInterface
}
}
private function isMainRequest(RequestEvent $event): bool
{
if (\method_exists($event, 'isMainRequest')) {
return $event->isMainRequest();
}
/** @phpstan-ignore-next-line */
return $event->isMasterRequest();
}
private function isIndexResourceRoute(string $route): bool
{
return str_ends_with($route, 'index');

8
src/Sylius/Bundle/AdminBundle/EventListener/ResourceDeleteSubscriber.php
View file

@ -46,13 +46,7 @@ final readonly class ResourceDeleteSubscriber implements EventSubscriberInterfac
return;
}
if (\method_exists($event, 'isMainRequest')) {
$isMainRequest = $event->isMainRequest();
} else {
/** @phpstan-ignore-next-line */
$isMainRequest = $event->isMasterRequest();
}
if (!$isMainRequest || 'html' !== $event->getRequest()->getRequestFormat()) {
if (!$event->isMainRequest() || 'html' !== $event->getRequest()->getRequestFormat()) {
return;
}

8
src/Sylius/Bundle/CoreBundle/Checkout/CheckoutResolver.php
View file

@ -42,13 +42,7 @@ final class CheckoutResolver implements EventSubscriberInterface
public function onKernelRequest(RequestEvent $event): void
{
if (\method_exists($event, 'isMainRequest')) {
$isMainRequest = $event->isMainRequest();
} else {
/** @phpstan-ignore-next-line */
$isMainRequest = $event->isMasterRequest();
}
if (!$isMainRequest) {
if (!$event->isMainRequest()) {
return;
}

12
src/Sylius/Bundle/CoreBundle/EventListener/XFrameOptionsSubscriber.php
View file

@ -28,7 +28,7 @@ final class XFrameOptionsSubscriber implements EventSubscriberInterface
public function onKernelResponse(ResponseEvent $event): void
{
if (!$this->isMainRequest($event)) {
if (!$event->isMainRequest()) {
return;
}
@ -36,14 +36,4 @@ final class XFrameOptionsSubscriber implements EventSubscriberInterface
$response->headers->set('X-Frame-Options', 'sameorigin');
}
private function isMainRequest(ResponseEvent $event): bool
{
if (\method_exists($event, 'isMainRequest')) {
return $event->isMainRequest();
}
/** @phpstan-ignore-next-line */
return $event->isMasterRequest();
}
}

8
src/Sylius/Bundle/ShopBundle/EventListener/NonChannelLocaleListener.php
View file

@ -46,13 +46,7 @@ final class NonChannelLocaleListener
*/
public function restrictRequestLocale(RequestEvent $event): void
{
if (\method_exists($event, 'isMainRequest')) {
$isMainRequest = $event->isMainRequest();
} else {
/** @phpstan-ignore-next-line */
$isMainRequest = $event->isMasterRequest();
}
if (!$isMainRequest) {
if (!$event->isMainRequest()) {
return;
}

8
src/Sylius/Bundle/ShopBundle/EventListener/SessionCartSubscriber.php
View file

@ -37,13 +37,7 @@ final class SessionCartSubscriber implements EventSubscriberInterface
public function onKernelResponse(ResponseEvent $event): void
{
if (\method_exists($event, 'isMainRequest')) {
$isMainRequest = $event->isMainRequest();
} else {
/** @phpstan-ignore-next-line */
$isMainRequest = $event->isMasterRequest();
}
if (!$isMainRequest) {
if (!$event->isMainRequest()) {
return;
}

44
src/Sylius/Bundle/ShopBundle/spec/EventListener/NonChannelLocaleListenerSpec.php
View file

@ -62,16 +62,12 @@ final class NonChannelLocaleListenerSpec extends ObjectBehavior
;
}
function it_does_nothing_if_its_not_a_master_request(
function it_does_nothing_if_its_not_a_main_request(
LocaleProviderInterface $localeProvider,
FirewallMap $firewallMap,
RequestEvent $event,
): void {
if (\method_exists(RequestEvent::class, 'isMainRequest')) {
$event->isMainRequest()->willReturn(false);
} else {
$event->isMasterRequest()->willReturn(false);
}
$event->isMainRequest()->willReturn(false);
$event->getRequest()->shouldNotBeCalled();
$firewallMap->getFirewallConfig(Argument::any())->shouldNotBeCalled();
@ -89,11 +85,7 @@ final class NonChannelLocaleListenerSpec extends ObjectBehavior
Request $request,
RequestEvent $event,
): void {
if (\method_exists(RequestEvent::class, 'isMainRequest')) {
$event->isMainRequest()->willReturn(true);
} else {
$event->isMasterRequest()->willReturn(true);
}
$event->isMainRequest()->willReturn(true);
$event->getRequest()->willReturn($request);
$firewallMap->getFirewallConfig($request)->willReturn(null);
@ -111,11 +103,7 @@ final class NonChannelLocaleListenerSpec extends ObjectBehavior
Request $request,
RequestEvent $event,
): void {
if (\method_exists(RequestEvent::class, 'isMainRequest')) {
$event->isMainRequest()->willReturn(true);
} else {
$event->isMasterRequest()->willReturn(true);
}
$event->isMainRequest()->willReturn(true);
$event->getRequest()->willReturn($request);
$firewallMap->getFirewallConfig($request)->willReturn(
new FirewallConfig('lalaland', 'mock'),
@ -135,11 +123,7 @@ final class NonChannelLocaleListenerSpec extends ObjectBehavior
Request $request,
RequestEvent $event,
): void {
if (\method_exists(RequestEvent::class, 'isMainRequest')) {
$event->isMainRequest()->willReturn(true);
} else {
$event->isMasterRequest()->willReturn(true);
}
$event->isMainRequest()->willReturn(true);
$event->getRequest()->willReturn($request);
$firewallMap->getFirewallConfig($request)->willReturn(
new FirewallConfig('shop', 'mock'),
@ -161,11 +145,7 @@ final class NonChannelLocaleListenerSpec extends ObjectBehavior
Request $request,
RequestEvent $event,
): void {
if (\method_exists(RequestEvent::class, 'isMainRequest')) {
$event->isMainRequest()->willReturn(true);
} else {
$event->isMasterRequest()->willReturn(true);
}
$event->isMainRequest()->willReturn(true);
$event->getRequest()->willReturn($request);
$firewallMap->getFirewallConfig($request)->willReturn(
new FirewallConfig('shop', 'mock'),
@ -190,11 +170,7 @@ final class NonChannelLocaleListenerSpec extends ObjectBehavior
RequestEvent $event,
Router $router,
): void {
if (\method_exists(RequestEvent::class, 'isMainRequest')) {
$event->isMainRequest()->willReturn(true);
} else {
$event->isMasterRequest()->willReturn(true);
}
$event->isMainRequest()->willReturn(true);
$event->getRequest()->willReturn($request);
$firewallMap->getFirewallConfig($request)->willReturn(
new FirewallConfig('shop', 'mock'),
@ -216,11 +192,7 @@ final class NonChannelLocaleListenerSpec extends ObjectBehavior
Request $request,
RequestEvent $event,
): void {
if (\method_exists(RequestEvent::class, 'isMainRequest')) {
$event->isMainRequest()->willReturn(true);
} else {
$event->isMasterRequest()->willReturn(true);
}
$event->isMainRequest()->willReturn(true);
$event->getRequest()->willReturn($request);
$request->getLocale()->willReturn('en');